aboutsummaryrefslogtreecommitdiffstats
path: root/kernel-rt
diff options
context:
space:
mode:
authorpiernov <piernov@piernov.org>2012-05-13 22:27:06 +0200
committerpiernov <piernov@piernov.org>2012-05-13 22:27:06 +0200
commit18bf8e9052e39aab1b9c4dda1657ddfaf4793a7d (patch)
tree00ab5b65d7626860cc2241dc392ccf80a7f71cc8 /kernel-rt
parentd99f6454103fad928f3b1612cdd35ddf86afa970 (diff)
parentdbbdb621565351ad1a76ee64fc52d4a1feb99c29 (diff)
downloadnutyx-multimedia-18bf8e9052e39aab1b9c4dda1657ddfaf4793a7d.tar.gz
nutyx-multimedia-18bf8e9052e39aab1b9c4dda1657ddfaf4793a7d.tar.bz2
nutyx-multimedia-18bf8e9052e39aab1b9c4dda1657ddfaf4793a7d.tar.xz
nutyx-multimedia-18bf8e9052e39aab1b9c4dda1657ddfaf4793a7d.zip
Merge branch 'master' of ssh://piernov.org/srv/git/nutyx-multimedia
Diffstat (limited to 'kernel-rt')
-rw-r--r--kernel-rt/Pkgfile99
-rw-r--r--kernel-rt/config59
-rw-r--r--kernel-rt/config_646
-rw-r--r--kernel-rt/post-install15
4 files changed, 91 insertions, 88 deletions
diff --git a/kernel-rt/Pkgfile b/kernel-rt/Pkgfile
index 32bc2ea..f639103 100644
--- a/kernel-rt/Pkgfile
+++ b/kernel-rt/Pkgfile
@@ -4,21 +4,20 @@
# Packager: thierryn1 at hispeed dot ch, tyrry33 at gmail dot com
name=kernel-rt
-version=3.2.1
+version=3.2.17
_BaseVersion=3.2
-release=rt10-1
+release=rt27-1
PKGMK_NO_STRIP="yes"
PKGMK_IGNORE_FOOTPRINT="yes"
PKGMK_IGNORE_MD5SUM="yes"
-SCRIPT_VERSION="pakxe.3"
+SCRIPT_VERSION="pakxe.4"
INITRDBASE="nutyx-initrd"
-_extra=30052011
-_tools=08112011
-NVIDIA_VERSION=290.10
-VB_VERSION=4.1.8
-VB_BUILD=75467
-ATI_VERSION=11.11
-RT_PATCH=rt10
+_extra=11032012
+_tools=24042012
+VB_VERSION=4.1.14
+VB_BUILD=77440
+RT_VERSION=3.2.16
+RT_PATCH=rt27
[ "`uname -m`" == "i686" ] && _ARCH=x86
[ "`uname -m`" == "x86_64" ] && _ARCH=x86_64
@@ -26,43 +25,67 @@ RT_PATCH=rt10
[ "`uname -m`" == "x86_64" ] && VB_ARCH=amd64
[ "`uname -m`" == "i686" ] && BC_ARCH=x86_32
[ "`uname -m`" == "x86_64" ] && BC_ARCH=x86_64
-source=(http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${BC_ARCH}-v5_100_82_112.tar.gz \
- http://download.virtualbox.org/virtualbox/${VB_VERSION}/VirtualBox-${VB_VERSION}-${VB_BUILD}-Linux_${VB_ARCH}.run \
- http://www2.ati.com/drivers/linux/ati-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run \
- makefile_compat.patch bc_wl_abiupdate.patch \
- http://fr.download.nvidia.com/XFree86/Linux-${_ARCH}/${NVIDIA_VERSION}/NVIDIA-Linux-${_ARCH}-${NVIDIA_VERSION}.run\
- http://www.kernel.org/pub/linux/kernel/v3.0/linux-${_BaseVersion}.tar.bz2 config_64 config\
- http://www.kernel.org/pub/linux/kernel/v3.0/patch-$version.bz2 \
- http://nutyx.meticul.eu/install-${SCRIPT_VERSION}.ash \
- http://nutyx.meticul.eu/files/nutyx-initrd-`uname -m`-${_extra}.tar.bz2\
+source=(http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${BC_ARCH}-v5_100_82_112.tar.gz
+ http://download.virtualbox.org/virtualbox/${VB_VERSION}/VirtualBox-${VB_VERSION}-${VB_BUILD}-Linux_${VB_ARCH}.run
+ http://www.kernel.org/pub/linux/kernel/v3.0/linux-${_BaseVersion}.tar.xz
+ http://www.kernel.org/pub/linux/kernel/v3.0/patch-$version.xz
+ http://nutyx.meticul.eu/install-${SCRIPT_VERSION}.ash
+ http://nutyx.meticul.eu/files/nutyx-initrd-`uname -m`-${_extra}.tar.bz2
http://nutyx.meticul.eu/files/installtools-${_tools}.tar.bz2
- http://www.kernel.org/pub/linux/kernel/projects/rt/${_BaseVersion}/patch-${_BaseVersion}-${RT_PATCH}.patch.xz)
+ http://www.kernel.org/pub/linux/kernel/projects/rt/${RT_VERSION%.*}/patch-${RT_VERSION}-${RT_PATCH}.patch.xz
+ makefile_compat.patch
+ bc_wl_abiupdate.patch
+ config_64
+ config
+)
+
build(){
+
+sed -i "s/^SCRIPT_VERSION=.\{1,\}/SCRIPT_VERSION=\"$SCRIPT_VERSION\"/" `prt-get printf %p --filter=$name`/$name/post-install
+# firmware
+git clone git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git
+rm -r linux-firmware/.git
+
+cp -a linux-firmware $INITRDBASE/rootfs/lib/firmware
+
+mkdir -p $PKG/lib
+cp -a linux-firmware $PKG/lib/firmware
+
+# initrd
+cd $SRC
+
+sed -i "s|#VERSION#|$SCRIPT_VERSION|g" \
+$INITRDBASE/rootfs/install/functions
+
for i in setup-install setup-mirroir
do
sed -i "s|#INSTALL#|install-$SCRIPT_VERSION.ash|" \
$INITRDBASE/rootfs/install/$i || exit 1
done
-for i in main.txt functions setup-grub setup-grub
+for i in main.txt setup-grub
do
sed -i "s|#VERSION#|MINI $SCRIPT_VERSION|g" \
$INITRDBASE/rootfs/install/$i
done
+
+# kernel sources
if ! [ -d /usr/src/linux-${_BaseVersion} ]; then
mv linux-${_BaseVersion} /usr/src/
ln -s /usr/src/linux-${_BaseVersion} linux-${_BaseVersion}
cd linux-${_BaseVersion}
- if [ -f $SRC/patch-$version.bz2 ]; then
- bzip2 -d -c $SRC/patch-$version.bz2 | patch -Np1
+ if [ -f $SRC/patch-$version.xz ]; then
+ xzcat $SRC/patch-$version.xz | patch -Np1
fi
- xzcat $SRC/patch-${_BaseVersion}-${RT_PATCH}.patch.xz | patch -p1
+ xzcat $SRC/patch-${RT_VERSION}-${RT_PATCH}.patch.xz | patch -p1
cd ..
else
rm -r linux-${_BaseVersion}
fi
ln -s /usr/src/linux-${_BaseVersion} linux-${_BaseVersion}
cd linux-${_BaseVersion}
+
# make mrproper
+
case `uname -m` in
x86_64)
mv $SRC/config_64 ./.config;;
@@ -70,7 +93,9 @@ case `uname -m` in
mv $SRC/config ./.config;;
esac
sed -i "s/EXTRAVERSION = .*/EXTRAVERSION =/" Makefile
-# make menuconfig
+# When a new patchlevel is release (3.2->3.3 for ex)
+# decomment and run make menuconfig
+#make menuconfig
case `uname -m` in
x86_64)
cp .config `prt-get printf %p --filter=$name`/$name/config_64;;
@@ -88,26 +113,7 @@ esac
cd $SRC
patch -p0 src/wl/sys/wl_linux.c < bc_wl_abiupdate.patch
KBUILD_NOPEDANTIC=1 make -C $SRC/linux-${_BaseVersion} M=`pwd`
-install -m 0644 -D wl.ko $PKG/lib/modules/${version}/kernel/drivers/zzzz/wl.ko
-
-# Module nvidia
-#cd $SRC
-#sh NVIDIA-Linux-${_ARCH}-${NVIDIA_VERSION}.run --extract-only
-#cd NVIDIA-Linux-${_ARCH}-${NVIDIA_VERSION}/kernel
-#ln -s Makefile{.kbuild,}
-#SYSSRC=$SRC/linux-${_BaseVersion} make module
-#install -m 0644 -D nvidia.ko $PKG/lib/modules/${version}/kernel/drivers/zzzz/nvidia.ko
-
-## Module ati
-#cd $SRC
-#sh ati-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run --extract ati
-#cd ati
-#patch -Np1 -i ../makefile_compat.patch
-#cd common/lib/modules/fglrx/build_mod
-#cp 2.6.x/Makefile .
-#cp $SRC/ati/arch/${_ARCH}/lib/modules/fglrx/build_mod/libfglrx_ip.a .
-#make -C $SRC/linux-${_BaseVersion} SUBDIRS="`pwd`" modules
-#install -m 0644 -D fglrx.ko $PKG/lib/modules/${version}/kernel/drivers/zzzz/fglrx.ko
+install -m 0644 -D wl.ko $PKG/lib/modules/${version}-${RT_PATCH}/kernel/drivers/zzzz/wl.ko
# Modules VB
cd $SRC
@@ -144,8 +150,7 @@ case `uname -m` in
esac
ln -sf kernel-$version $PKG/boot/kernel
cd $PKG/lib/modules/${version}-${RT_PATCH}/
-if [ -d build ]; then rm build; fi
-if [ -d source ]; then rm source; fi
+rm {build,source}
ln -sv /usr/src/linux-${_BaseVersion} build
ln -sv /usr/src/linux-${_BaseVersion} source
diff --git a/kernel-rt/config b/kernel-rt/config
index 539d184..164ee28 100644
--- a/kernel-rt/config
+++ b/kernel-rt/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.1 Kernel Configuration
+# Linux/i386 3.2.9 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -26,8 +26,8 @@ CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_GPIO=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
# CONFIG_GENERIC_TIME_VSYSCALL is not set
@@ -105,12 +105,16 @@ CONFIG_SPARSE_IRQ=y
#
# RCU Subsystem
#
-CONFIG_TREE_RCU=y
-# CONFIG_PREEMPT_RCU is not set
+# CONFIG_TREE_RCU is not set
+CONFIG_TREE_PREEMPT_RCU=y
+CONFIG_PREEMPT_RCU=y
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
# CONFIG_RCU_FANOUT_EXACT is not set
# CONFIG_TREE_RCU_TRACE is not set
+CONFIG_RCU_BOOST=y
+CONFIG_RCU_BOOST_PRIO=1
+CONFIG_RCU_BOOST_DELAY=500
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=17
@@ -188,8 +192,6 @@ CONFIG_SLAB=y
# CONFIG_SLUB is not set
# CONFIG_SLOB is not set
CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
CONFIG_HAVE_OPROFILE=y
# CONFIG_KPROBES is not set
# CONFIG_JUMP_LABEL is not set
@@ -250,29 +252,29 @@ CONFIG_PADATA=y
# CONFIG_INLINE_SPIN_LOCK_BH is not set
# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK is not set
# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
# CONFIG_INLINE_READ_TRYLOCK is not set
# CONFIG_INLINE_READ_LOCK is not set
# CONFIG_INLINE_READ_LOCK_BH is not set
# CONFIG_INLINE_READ_LOCK_IRQ is not set
# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK is not set
# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
# CONFIG_INLINE_WRITE_TRYLOCK is not set
# CONFIG_INLINE_WRITE_LOCK is not set
# CONFIG_INLINE_WRITE_LOCK_BH is not set
# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK is not set
# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-CONFIG_MUTEX_SPIN_ON_OWNER=y
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
CONFIG_FREEZER=y
#
@@ -363,9 +365,14 @@ CONFIG_NR_CPUS=8
CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_RT_BASE=y
# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT__LL is not set
+# CONFIG_PREEMPT_RTB is not set
+CONFIG_PREEMPT_RT_FULL=y
+CONFIG_PREEMPT_COUNT=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
@@ -424,8 +431,7 @@ CONFIG_VIRT_TO_BUS=y
CONFIG_MMU_NOTIFIER=y
CONFIG_KSM=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
# CONFIG_CLEANCACHE is not set
CONFIG_HIGHPTE=y
@@ -1307,7 +1313,8 @@ CONFIG_NFC_WILINK=m
# Generic Driver Options
#
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_DEVTMPFS is not set
+CONFIG_DEVTMPFS=y
+# CONFIG_DEVTMPFS_MOUNT is not set
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
@@ -1906,11 +1913,8 @@ CONFIG_IEEE802154_DRIVERS=m
CONFIG_IFB=m
CONFIG_MACVLAN=m
CONFIG_MACVTAP=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
CONFIG_TUN=m
# CONFIG_VETH is not set
CONFIG_VIRTIO_NET=m
@@ -4017,7 +4021,6 @@ CONFIG_DRM_TDFX=m
CONFIG_DRM_R128=m
CONFIG_DRM_RADEON=m
CONFIG_DRM_RADEON_KMS=y
-CONFIG_DRM_I810=m
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
CONFIG_DRM_MGA=m
@@ -5477,13 +5480,13 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
CONFIG_ENABLE_MUST_CHECK=y
CONFIG_FRAME_WARN=0
CONFIG_MAGIC_SYSRQ=y
+# CONFIG_MAGIC_SYSRQ_FORCE_PRINTK is not set
# CONFIG_STRIP_ASM_SYMS is not set
CONFIG_UNUSED_SYMBOLS=y
CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
# CONFIG_DEBUG_SECTION_MISMATCH is not set
CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SHIRQ is not set
# CONFIG_LOCKUP_DETECTOR is not set
# CONFIG_HARDLOCKUP_DETECTOR is not set
# CONFIG_DETECT_HUNG_TASK is not set
@@ -5492,6 +5495,7 @@ CONFIG_SCHED_DEBUG=y
# CONFIG_TIMER_STATS is not set
# CONFIG_DEBUG_OBJECTS is not set
# CONFIG_DEBUG_SLAB is not set
+CONFIG_DEBUG_PREEMPT=y
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set
@@ -5521,6 +5525,7 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y
# CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_RCU_CPU_STALL_VERBOSE=y
CONFIG_BACKTRACE_SELF_TEST=m
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
@@ -5540,8 +5545,6 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_RING_BUFFER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
CONFIG_TRACING_SUPPORT=y
# CONFIG_FTRACE is not set
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
diff --git a/kernel-rt/config_64 b/kernel-rt/config_64
index 04db60d..33d780d 100644
--- a/kernel-rt/config_64
+++ b/kernel-rt/config_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.1 Kernel Configuration
+# Linux/x86_64 3.2.17 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -1269,7 +1269,8 @@ CONFIG_NFC_WILINK=m
# Generic Driver Options
#
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_DEVTMPFS is not set
+CONFIG_DEVTMPFS=y
+# CONFIG_DEVTMPFS_MOUNT is not set
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
@@ -4910,7 +4911,6 @@ CONFIG_R8187SE=m
CONFIG_RTL8192U=m
CONFIG_RTL8192E=m
CONFIG_R8712U=m
-CONFIG_R8712_AP=y
CONFIG_RTS_PSTOR=m
# CONFIG_RTS_PSTOR_DEBUG is not set
CONFIG_RTS5139=m
diff --git a/kernel-rt/post-install b/kernel-rt/post-install
index a938076..a746f67 100644
--- a/kernel-rt/post-install
+++ b/kernel-rt/post-install
@@ -1,14 +1,6 @@
-version=3.2.1
-if [ ! -d /lib/modules/${version} ]; then
- echo "post-install impossible"
- echo "/lib/modules/${version} pas trouvé"
- exit 1
-fi
-SCRIPT_VERSION="pakxe.3"
+SCRIPT_VERSION="pakxe.4"
SRC=/tmp/work
WDIR=$SRC/nutyx-initrd
-ARCH=`uname -m`
-depmod $version
if [ ! -d $SRC ]; then
mkdir -p $SRC
fi
@@ -28,9 +20,12 @@ done
# Copie des modules kernels
mkdir -p $WDIR/rootfs/lib/modules
-cp -a /lib/modules/${version} \
+cp -a /lib/modules/* \
$WDIR/rootfs/lib/modules/
+cp -a /lib/firmware \
+$WDIR/rootfs/lib/
+
# Copie du script d'install
cp /root/bin/install-${SCRIPT_VERSION}.ash $WDIR/rootfs/install/