webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 19:15:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/kernel-update' into thirteen

Browse Source
This commit is contained in:
Michael Tremer
2012-08-28 20:21:20 +02:00
parent e84a520f5e 5fe5aedd2a
commit 25378ca64d
17 changed files with 1982 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
config/kernel/kernel.config.armv5tel-ipfire-omap
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 3.2.21 Kernel Configuration
# Linux/arm 3.2.28-ipfire-omap Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -2844,86 +2844,12 @@ CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=m
CONFIG_SND_OMAP_SOC_ZOOM2=m
CONFIG_SND_OMAP_SOC_IGEP0020=m
CONFIG_SND_SOC_I2C_AND_SPI=m
CONFIG_SND_SOC_ALL_CODECS=m
CONFIG_SND_SOC_WM_HUBS=m
CONFIG_SND_SOC_AD193X=m
CONFIG_SND_SOC_AD73311=m
CONFIG_SND_SOC_ADAU1373=m
CONFIG_SND_SOC_ADAV80X=m
CONFIG_SND_SOC_ADS117X=m
CONFIG_SND_SOC_AK4535=m
CONFIG_SND_SOC_AK4641=m
CONFIG_SND_SOC_AK4642=m
CONFIG_SND_SOC_AK4671=m
CONFIG_SND_SOC_ALC5623=m
CONFIG_SND_SOC_CS42L51=m
CONFIG_SND_SOC_CS4270=m
CONFIG_SND_SOC_CS4271=m
CONFIG_SND_SOC_CX20442=m
CONFIG_SND_SOC_JZ4740_CODEC=m
CONFIG_SND_SOC_L3=m
CONFIG_SND_SOC_DA7210=m
CONFIG_SND_SOC_DFBMCS320=m
CONFIG_SND_SOC_MAX98088=m
CONFIG_SND_SOC_MAX98095=m
CONFIG_SND_SOC_MAX9850=m
CONFIG_SND_SOC_PCM3008=m
CONFIG_SND_SOC_RT5631=m
CONFIG_SND_SOC_SGTL5000=m
CONFIG_SND_SOC_SPDIF=m
CONFIG_SND_SOC_SSM2602=m
CONFIG_SND_SOC_STA32X=m
# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_TLV320AIC23=m
CONFIG_SND_SOC_TLV320AIC32X4=m
CONFIG_SND_SOC_TLV320AIC3X=m
CONFIG_SND_SOC_TLV320DAC33=m
CONFIG_SND_SOC_TWL4030=m
CONFIG_SND_SOC_TWL6040=m
CONFIG_SND_SOC_UDA134X=m
CONFIG_SND_SOC_UDA1380=m
CONFIG_SND_SOC_WL1273=m
CONFIG_SND_SOC_WM1250_EV1=m
CONFIG_SND_SOC_WM5100=m
CONFIG_SND_SOC_WM8400=m
CONFIG_SND_SOC_WM8510=m
CONFIG_SND_SOC_WM8523=m
CONFIG_SND_SOC_WM8580=m
CONFIG_SND_SOC_WM8711=m
CONFIG_SND_SOC_WM8727=m
CONFIG_SND_SOC_WM8728=m
CONFIG_SND_SOC_WM8731=m
CONFIG_SND_SOC_WM8737=m
CONFIG_SND_SOC_WM8741=m
CONFIG_SND_SOC_WM8750=m
CONFIG_SND_SOC_WM8753=m
CONFIG_SND_SOC_WM8776=m
CONFIG_SND_SOC_WM8782=m
CONFIG_SND_SOC_WM8804=m
CONFIG_SND_SOC_WM8900=m
CONFIG_SND_SOC_WM8903=m
CONFIG_SND_SOC_WM8904=m
CONFIG_SND_SOC_WM8940=m
CONFIG_SND_SOC_WM8955=m
CONFIG_SND_SOC_WM8960=m
CONFIG_SND_SOC_WM8961=m
CONFIG_SND_SOC_WM8962=m
CONFIG_SND_SOC_WM8971=m
CONFIG_SND_SOC_WM8974=m
CONFIG_SND_SOC_WM8978=m
CONFIG_SND_SOC_WM8983=m
CONFIG_SND_SOC_WM8985=m
CONFIG_SND_SOC_WM8988=m
CONFIG_SND_SOC_WM8990=m
CONFIG_SND_SOC_WM8991=m
CONFIG_SND_SOC_WM8993=m
CONFIG_SND_SOC_WM8995=m
CONFIG_SND_SOC_WM8996=m
CONFIG_SND_SOC_WM9081=m
CONFIG_SND_SOC_LM4857=m
CONFIG_SND_SOC_MAX9877=m
CONFIG_SND_SOC_TPA6130A2=m
CONFIG_SND_SOC_WM2000=m
CONFIG_SND_SOC_WM9090=m
# CONFIG_SOUND_PRIME is not set
CONFIG_HID_SUPPORT=y
CONFIG_HID=y

10
config/kernel/kernel.config.armv5tel-ipfire-rpi
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 3.2.21 Kernel Configuration
# Linux/arm 3.2.28 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -122,10 +122,9 @@ CONFIG_PERF_USE_VMALLOC=y
# CONFIG_PERF_EVENTS is not set
# CONFIG_PERF_COUNTERS is not set
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_SLUB_DEBUG=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_SLAB is not set
CONFIG_SLUB=y
CONFIG_SLAB=y
# CONFIG_SLUB is not set
# CONFIG_SLOB is not set
# CONFIG_PROFILING is not set
CONFIG_HAVE_OPROFILE=y
@@ -3183,8 +3182,7 @@ CONFIG_SCHED_DEBUG=y
# CONFIG_SCHEDSTATS is not set
CONFIG_TIMER_STATS=y
# CONFIG_DEBUG_OBJECTS is not set
# CONFIG_SLUB_DEBUG_ON is not set
# CONFIG_SLUB_STATS is not set
# CONFIG_DEBUG_SLAB is not set
# CONFIG_DEBUG_KMEMLEAK is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_RT_MUTEX_TESTER is not set

1947
config/rootfiles/common/armv5tel/glibc
View File

File diff suppressed because it is too large Load Diff

1
config/rootfiles/common/armv5tel/rpi-firmware
View File

@@ -2,6 +2,7 @@
boot/arm128_start.elf
boot/arm192_start.elf
boot/arm224_start.elf
boot/arm240_start.elf
boot/bootcode.bin
boot/cmdline.txt
#boot/first32k.bin

14
config/rootfiles/common/rrdtool
View File

@@ -16,13 +16,13 @@ usr/lib/librrd.so.4.2.0
usr/lib/librrd_th.so.4
usr/lib/librrd_th.so.4.2.0
usr/lib/perl5/site_perl/5.12.3/RRDp.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/RRDs.pm
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/RRDp
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/RRDp/.packlist
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/RRDs
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/RRDs/.packlist
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/RRDs/RRDs.bs
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/RRDs/RRDs.so
usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/RRDs.pm
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDp
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDp/.packlist
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/.packlist
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.bs
usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.so
#usr/lib/pkgconfig/librrd.pc
#usr/share/doc/rrdtool-1.4.7
#usr/share/doc/rrdtool-1.4.7/html

1
lfs/binutils
View File

@@ -44,6 +44,7 @@ ifeq "$(ROOT)" ""
else
ifeq "$(PASS)" "1"
CFLAGS := $(patsubst -march=%,,$(CFLAGS))
CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
TARGET = $(DIR_INFO)/$(THISAPP)-tools1
EXTRA_CONFIG = \
--target=$(CROSSTARGET) \

1
lfs/ccache
View File

@@ -34,6 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP)-pass$(PASS)
ifeq "$(PASS)" "1"
CFLAGS := $(patsubst -march=%,,$(CFLAGS))
CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
endif
# Set max cache size to 5GB

5
lfs/gcc
View File

@@ -36,6 +36,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS := $(patsubst -march=%,,$(CFLAGS))
CFLAGS := $(patsubst -mtune=%,,$(CFLAGS))
CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
# Normal build or /tools build.
#
@@ -118,10 +119,6 @@ EXTRA_CONFIG += \
export XCFLAGS = $(CFLAGS)
export TCFLAGS = $(CFLAGS)
ifeq "$(PASS)" "1"
CFLAGS =
endif
###############################################################################
# Top-level Rules
###############################################################################

2
lfs/gettext
View File

@@ -89,7 +89,7 @@ ifeq "$(ROOT)" ""
cd $(DIR_APP) && make $(EXTRA_INSTALL) install
else
cd $(DIR_APP)/gettext-tools && ./configure $(EXTRA_CONFIG)
cd $(DIR_APP)/gettext-tools && make -C lib
cd $(DIR_APP)/gettext-tools && make -C gnulib-lib
cd $(DIR_APP)/gettext-tools && make -C src msgfmt
cd $(DIR_APP)/gettext-tools && cp -v src/msgfmt /tools/bin
endif

7
lfs/linux
View File

@@ -26,7 +26,7 @@ include Config
VER = 3.2.28
RPI_PATCHES = linux-3.2-bootc-f23da7f
RPI_PATCHES = linux-3.2.27-091073b
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.bz2
@@ -76,7 +76,7 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
$(DL_FILE)_MD5 = d387130f084f48fae7b2d1756f6c9257
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 5651c6411bb1cbdbfe4b2908c117aaf3
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 9daec752fba403a488818df6dd57a714
install : $(TARGET)
@@ -152,8 +152,7 @@ endif
ifeq "$(KCFG)" "-rpi"
# Apply Raspberry Pi kernel patches.
cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-$(RPI_PATCHES).patch.xz | patch -Np1
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-bcm2835-alsamixer.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-bcm2835-limit_volume.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.27-rpi_fix_dwc_common_build.patch
endif
ifeq "$(HEADERS)" "1"

8
lfs/linux2
View File

@@ -74,19 +74,19 @@ objects =$(DL_FILE) \
netfilter-layer7-v2.22.tar.gz \
patch-2.6.16-nath323-1.3.bz2 \
reiser4-for-2.6.32.patch.bz2 \
xen-patches-2.6.32-2f.tar.bz2
xen-patches-2.6.32-2g.tar.bz2
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz
patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2
xen-patches-2.6.32-2f.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2
xen-patches-2.6.32-2g.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2g.tar.bz2
$(DL_FILE)_MD5 = 69c68c4a8eb0f04b051a7dbcff16f6d0
netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91
xen-patches-2.6.32-2f.tar.bz2_MD5 = b59d6f89e11accb9d40354418e13f31b
xen-patches-2.6.32-2g.tar.bz2_MD5 = d259a847c9aa73cd6e5c3605d9657d66
install : $(TARGET)
@@ -124,7 +124,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ifeq "$(KCFG)" "-xen"
# Apply gentoo Xen patches
mkdir -p $(DIR_SRC)/xen-patches
cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2f.tar.bz2
cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2g.tar.bz2
for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \
echo "*********** [Patch: $$x]"; \

4
lfs/php
View File

@@ -32,6 +32,10 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
ifeq "$(MACHINE_TYPE)" "arm"
CFLAGS := $(patsubst -march=%,,$(CFLAGS))
endif
###############################################################################
# Top-level Rules
###############################################################################

5
lfs/rpi-firmware
View File

@@ -24,8 +24,7 @@
include Config
VER = 1309b3d
VER = b2200cd
THISAPP = rpi-firmware-$(VER)
DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
@@ -41,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 90978c567f9bcd2aad2c1c138acb3518
$(DL_FILE)_MD5 = d4b0a5b5fe8cdbe5df17aadd5ec60ff0
install : $(TARGET)

8
make.sh
View File

@@ -378,12 +378,12 @@ buildipfire() {
# The xen and PAE kernels are only available for x86
if [ "${MACHINE_TYPE}" != "arm" ]; then
# ipfiremake linux2 KCFG="-xen"
ipfiremake linux2 KCFG="-xen"
# ipfiremake v4l-dvb KCFG="-xen"
# ipfiremake mISDN KCFG="-xen"
# ipfiremake dahdi KCFG="-xen" KMOD=1
# ipfiremake cryptodev KCFG="-xen"
# ipfiremake compat-wireless KCFG="-xen"
ipfiremake dahdi KCFG="-xen" KMOD=1
ipfiremake cryptodev KCFG="-xen"
ipfiremake compat-wireless KCFG="-xen"
# ipfiremake r8169 KCFG="-xen"
# ipfiremake r8168 KCFG="-xen"
# ipfiremake r8101 KCFG="-xen"

48
src/patches/linux-3.2-bcm2835-alsamixer.patch
View File

@@ -1,48 +0,0 @@
diff -Naur linux-3.2.19.org/sound/arm/bcm2835-ctl.c linux-3.2.19/sound/arm/bcm2835-ctl.c
--- linux-3.2.19.org/sound/arm/bcm2835-ctl.c 2012-06-04 21:11:15.000000000 +0200
+++ linux-3.2.19/sound/arm/bcm2835-ctl.c 2012-06-04 21:32:37.969298501 +0200
@@ -33,6 +33,19 @@
#include "bcm2835.h"
+
+/* functions to convert alsa to chip volume and back. */
+int alsa2chip(int vol)
+{
+ return -((vol << 8) / 100);
+}
+
+int chip2alsa(int vol)
+{
+ return -((vol * 100) >> 8);
+}
+
+
static int snd_bcm2835_ctl_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{
@@ -64,7 +77,7 @@
BUG_ON(!chip && !(chip->avail_substreams & AVAIL_SUBSTREAMS_MASK));
if (kcontrol->private_value == PCM_PLAYBACK_VOLUME)
- ucontrol->value.integer.value[0] = chip->volume;
+ ucontrol->value.integer.value[0] = chip2alsa(chip->volume);
else if (kcontrol->private_value == PCM_PLAYBACK_MUTE)
ucontrol->value.integer.value[0] = chip->mute;
else if (kcontrol->private_value == PCM_PLAYBACK_DEVICE)
@@ -85,13 +98,10 @@
changed = 1;
}
if (changed
- || (ucontrol->value.integer.value[0] != chip->volume)) {
- int atten;
+ || (ucontrol->value.integer.value[0] != chip2alsa(chip->volume))) {
- chip->volume = ucontrol->value.integer.value[0];
+ chip->volume = alsa2chip(ucontrol->value.integer.value[0]);
changed = 1;
- atten = -((chip->volume << 8) / 100);
- chip->volume = atten;
}
} else if (kcontrol->private_value == PCM_PLAYBACK_MUTE) {

12
src/patches/linux-3.2-bcm2835-limit_volume.patch
View File

@@ -1,12 +0,0 @@
diff -Naur linux-3.2.19.org/sound/arm/bcm2835-ctl.c linux-3.2.19/sound/arm/bcm2835-ctl.c
--- linux-3.2.19.org/sound/arm/bcm2835-ctl.c 2012-06-04 22:38:54.000000000 +0200
+++ linux-3.2.19/sound/arm/bcm2835-ctl.c 2012-06-05 22:37:46.343725845 +0200
@@ -53,7 +53,7 @@
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
uinfo->count = 1;
uinfo->value.integer.min = -10240;
- uinfo->value.integer.max = 2303;
+ uinfo->value.integer.max = 400; /* 2303 */
} else if (kcontrol->private_value == PCM_PLAYBACK_MUTE) {
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
uinfo->count = 1;

38
src/patches/linux-3.2.27-rpi_fix_dwc_common_build.patch Normal file
View File

@@ -0,0 +1,38 @@
diff -Naur linux-3.2.27.org/drivers/usb/host/dwc_common_port/Makefile linux-3.2.27/drivers/usb/host/dwc_common_port/Makefile
--- linux-3.2.27.org/drivers/usb/host/dwc_common_port/Makefile 2012-08-21 05:05:46.000000000 -0400
+++ linux-3.2.27/drivers/usb/host/dwc_common_port/Makefile 2012-08-21 06:32:23.501695852 -0400
@@ -30,15 +30,6 @@
else
-ifeq ($(KDIR),)
-$(error Must give "KDIR=/path/to/kernel/source" on command line or in environment)
-endif
-
-ifeq ($(ARCH),)
-$(error Must give "ARCH=<arch>" on command line or in environment. Also, if \
- cross-compiling, must give "CROSS_COMPILE=/path/to/compiler/plus/tool-prefix-")
-endif
-
ifeq ($(DOXYGEN),)
DOXYGEN := doxygen
endif
diff -Naur linux-3.2.27.org/drivers/usb/host/dwc_common_port/Makefile.linux linux-3.2.27/drivers/usb/host/dwc_common_port/Makefile.linux
--- linux-3.2.27.org/drivers/usb/host/dwc_common_port/Makefile.linux 2012-08-21 05:05:46.000000000 -0400
+++ linux-3.2.27/drivers/usb/host/dwc_common_port/Makefile.linux 2012-08-21 05:22:35.964969680 -0400
@@ -21,15 +21,6 @@
else
-ifeq ($(KDIR),)
-$(error Must give "KDIR=/path/to/kernel/source" on command line or in environment)
-endif
-
-ifeq ($(ARCH),)
-$(error Must give "ARCH=<arch>" on command line or in environment. Also, if \
- cross-compiling, must give "CROSS_COMPILE=/path/to/compiler/plus/tool-prefix-")
-endif
-
ifeq ($(DOXYGEN),)
DOXYGEN := doxygen
endif