From c6e952d51cdaae257fa2be6141a4c7fd603a6b9b Mon Sep 17 00:00:00 2001 From: Bill Durr Date: Fri, 2 Sep 2011 02:09:28 -0400 Subject: [PATCH] renamed kernel26-orion to linux-orion. linux-orion to 3.0.3-1 --- core/kernel26-orion/PKGBUILD | 215 --------------- core/kernel26-orion/kernel26.preset | 17 -- core/linux-orion/PKGBUILD | 247 ++++++++++++++++++ .../archlinuxarm.patch | 0 .../change-default-console-loglevel.patch | 12 + .../config} | 114 +++++--- .../linux-orion.install} | 38 ++- 7 files changed, 360 insertions(+), 283 deletions(-) delete mode 100644 core/kernel26-orion/PKGBUILD delete mode 100644 core/kernel26-orion/kernel26.preset create mode 100644 core/linux-orion/PKGBUILD rename core/{kernel26-orion => linux-orion}/archlinuxarm.patch (100%) create mode 100644 core/linux-orion/change-default-console-loglevel.patch rename core/{kernel26-orion/2.6.39-orion.config => linux-orion/config} (98%) rename core/{kernel26-orion/kernel26.install => linux-orion/linux-orion.install} (79%) diff --git a/core/kernel26-orion/PKGBUILD b/core/kernel26-orion/PKGBUILD deleted file mode 100644 index 1b98513f1..000000000 --- a/core/kernel26-orion/PKGBUILD +++ /dev/null @@ -1,215 +0,0 @@ -# Maintainer: Mike Staszel -# Maintainer: Kevin Mihelich -# Contributor: Julian Langschaedel - -noautobuild=1 -plugrel=1 - -pkgbase="kernel26" -pkgname=('kernel26-orion' 'kernel26-headers-orion') -_kernelname=${pkgname#kernel26} -_basekernel=2.6.39 -pkgver=${_basekernel}.3 -_pkgrel=1 -pkgrel=${_pkgrel} -#pkgrel=${_pkgrel}.${plugrel} -makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'make') -_patchname="patch-${pkgver}-${_pkgrel}-ARCH" -#_patchname="patch-${pkgver}-1-ARCH" -replaces=('kernel26-withlinux' 'kernel26-dockstar') -arch=(arm) -CARCH=arm -KARCH=arm -LDFLAGS="" -license=('GPL2') -url="http://www.kernel.org" -source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2 - ftp://ftp.archlinux.org/other/kernel26/${_patchname}.bz2 - ${_basekernel}-orion.config - archlinuxarm.patch) -md5sums=('1aab7a741abe08d42e8eccf20de61e05' - 'b23d7def30e57242cfe088f4d8ca8baa' - 'effb50068f8f8baef57dd665a4e4065d' - '77e8e011485c2061616214d07356132e') - - -build() { - echo $PATH - cd ${srcdir}/linux-$_basekernel - # Add -ARCH patches - # See http://projects.archlinux.org/linux-2.6-ARCH.git/ - patch -Np1 -i ${srcdir}/${_patchname} - - # Add Arch Linux ARM patch for ARMv5te plug computers - patch -Np1 -i ${srcdir}/archlinuxarm.patch - - # Copy in our configuration - cp ../${_basekernel}-orion.config ./.config - - # Prepare sources - #make prepare - # 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 oldconfig # using old config from previous kernel version - - # Copy back our configuration (use with new kernel version) - #cp ./.config ../${_basekernel}.config - - # Halt the build for configuration only - #return 1 - - # Build! - make ${MAKEFLAGS} zImage modules -} - -package_kernel26-orion() { - pkgdesc="The Linux Kernel and modules" - groups=('base') - depends=('coreutils' 'module-init-tools>=3.12-2' 'devio') - replaces=('kernel24' 'kernel24-scsi' 'kernel26-scsi' - 'alsa-driver' 'ieee80211' 'hostap-driver26' - 'pwc' 'nforce' 'squashfs' 'unionfs' 'ivtv' - 'zd1211' 'kvm-modules' 'iwlwifi' 'rt2x00-cvs' - 'gspcav1' 'atl2' 'wlan-ng26' 'rt2500' 'nouveau-drm' - 'kernel26-withlinux' 'kernel26-dockstar') - provides=('kernel26=2.6.39') - install=kernel26.install - optdepends=('crda: to set the correct wireless channels of your country') - - KARCH=arm - cd ${srcdir}/linux-$_basekernel - # get kernel version - _kernver="$(make kernelrelease)" - mkdir -p ${pkgdir}/{lib/modules,lib/firmware,boot} - make INSTALL_MOD_PATH=${pkgdir} modules_install - cp System.map ${pkgdir}/boot/System.map26${_kernelname} - cp arch/$KARCH/boot/zImage ${pkgdir}/boot/zImage - - # 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/kernel26.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 {} \; -} - -package_kernel26-headers-orion() { - pkgdesc="Header files and scripts for building modules for kernel26" - KARCH=arm - - mkdir -p ${pkgdir}/lib/modules/${_kernver} - cd ${pkgdir}/lib/modules/${_kernver} - ln -sf ../../../usr/src/linux-${_kernver} build - cd ${srcdir}/linux-$_basekernel - 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-kirkwood - cp -a arch/$KARCH/mach-kirkwood/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-kirkwood/ - - # 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 et61x251 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/ - # add dvb headers for external modules - # in reference to: - # 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/ - # add xfs and shmem for aufs building - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/mm - cp fs/xfs/xfs_sb.h ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h - # 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,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,x86,xtensa} -} diff --git a/core/kernel26-orion/kernel26.preset b/core/kernel26-orion/kernel26.preset deleted file mode 100644 index 742a44239..000000000 --- a/core/kernel26-orion/kernel26.preset +++ /dev/null @@ -1,17 +0,0 @@ -# mkinitcpio preset file for kernel26 - -######################################## -# DO NOT EDIT THIS LINE: -source /etc/mkinitcpio.d/kernel26.kver -######################################## -ALL_config="/etc/mkinitcpio.conf" - -PRESETS=('default' 'fallback') - -#default_config="/etc/mkinitcpio.conf" -default_image="/boot/kernel26.img" -#default_options="" - -#fallback_config="/etc/mkinitcpio.conf" -fallback_image="/boot/kernel26-fallback.img" -fallback_options="-S autodetect" \ No newline at end of file diff --git a/core/linux-orion/PKGBUILD b/core/linux-orion/PKGBUILD new file mode 100644 index 000000000..b6deeeaba --- /dev/null +++ b/core/linux-orion/PKGBUILD @@ -0,0 +1,247 @@ +# Maintainer: Bill Durr + +noautobuild=1 +plugrel=1 + +pkgbase=linux-orion +pkgname=('linux-orion' 'linux-headers-orion') +# pkgname=linux-custom # Build kernel with a different name +_kernelname=${pkgname#linux} +_basekernel=3.0 +pkgver=${_basekernel}.3 +pkgrel=1 +arch=('arm') +url="http://www.kernel.org/" +license=('GPL2') +makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage') +options=('!strip') +source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-${_basekernel}.tar.bz2" + "ftp://ftp.kernel.org/pub/linux/kernel/v3.0/patch-${pkgver}.bz2" + 'archlinuxarm.patch' + 'config' + 'change-default-console-loglevel.patch') +md5sums=('398e95866794def22b12dfbc15ce89c0' + '1757786b9a9ffbd48ad9642199ff5bd7' + '77e8e011485c2061616214d07356132e' + '1d5e11e7d81c314f8c9bde5d5b63da3e' + '9d3c56a4b999c8bfbd4018089a62f662') + +build() { + cd "${srcdir}/linux-${_basekernel}" + + patch -p1 -i "${srcdir}/patch-${pkgver}" + + # Add Arch Linux ARM patch for ARMv5te plug computers + patch -Np1 -i ${srcdir}/archlinuxarm.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" + + cat "${srcdir}/config" > ./.config + + # remove the sublevel from Makefile + # this ensures our kernel version is always 3.X-ARCH + # this way, minor kernel updates will not break external modules + # we need to change this soon, see FS#16702 + sed -ri 's|^(SUBLEVEL =).*|\1|' Makefile + + # 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 ../${_basekernel}.config + + #################### + # stop here + # this is useful to configure the kernel + #msg "Stopping build" + #return 1 + #################### + + #yes "" | make config + + # build! + make ${MAKEFLAGS} zImage modules +} + +package_linux-orion() { + pkgdesc="The Linux Kernel and modules" + groups=('base') + depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16' 'mkinitcpio>=0.7' 'devio') + optdepends=('crda: to set the correct wireless channels of your country') + provides=('kernel26' 'kernel26-orion' 'linux=${pkgver}') + conflicts=('kernel26' 'kernel26-orion') + replaces=('kernel26-orion') + backup=("etc/mkinitcpio.d/${pkgname}.preset") + install=${pkgname}.install + + cd "${srcdir}/linux-${_basekernel}" + + KARCH=arm + + # get kernel version + _kernver="$(make kernelrelease)" + + mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} + make INSTALL_MOD_PATH="${pkgdir}" modules_install + cp arch/$KARCH/boot/zImage "${pkgdir}/boot/zImage" + + # 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 safe 100MB of space + find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; +} + +package_linux-headers-orion() { + pkgdesc="Header files and scripts for building modules for linux kernel" + provides=('kernel26-headers' 'kernel26-headers-orion' 'linux-headers=${pkgver}') + conflicts=('kernel26-headers' 'kernel26-headers-orion') + replaces=('kernel26-headers-orion') + + mkdir -p "${pkgdir}/lib/modules/${_kernver}" + + cd "${pkgdir}/lib/modules/${_kernver}" + ln -sf ../../../usr/src/linux-${_kernver} build + + cd "${srcdir}/linux-${_basekernel}" + 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-kirkwood + cp -a arch/$KARCH/mach-kirkwood/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-kirkwood/ + + # 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 et61x251 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/" + + # add xfs and shmem for aufs building + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm" + cp fs/xfs/xfs_sb.h "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h" + + # 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} +} diff --git a/core/kernel26-orion/archlinuxarm.patch b/core/linux-orion/archlinuxarm.patch similarity index 100% rename from core/kernel26-orion/archlinuxarm.patch rename to core/linux-orion/archlinuxarm.patch diff --git a/core/linux-orion/change-default-console-loglevel.patch b/core/linux-orion/change-default-console-loglevel.patch new file mode 100644 index 000000000..63435d84f --- /dev/null +++ b/core/linux-orion/change-default-console-loglevel.patch @@ -0,0 +1,12 @@ +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); + diff --git a/core/kernel26-orion/2.6.39-orion.config b/core/linux-orion/config similarity index 98% rename from core/kernel26-orion/2.6.39-orion.config rename to core/linux-orion/config index 2bd647003..97dbb2b2f 100644 --- a/core/kernel26-orion/2.6.39-orion.config +++ b/core/linux-orion/config @@ -1,7 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/arm 2.6.39 Kernel Configuration -# Fri Jul 22 00:45:05 2011 +# Linux/arm 3.0 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -25,7 +24,6 @@ CONFIG_NEED_DMA_MAP_STATE=y CONFIG_VECTORS_BASE=0xffff0000 # CONFIG_ARM_PATCH_PHYS_VIRT is not set CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_CONSTRUCTORS=y CONFIG_HAVE_IRQ_WORK=y CONFIG_IRQ_WORK=y @@ -44,6 +42,7 @@ CONFIG_HAVE_KERNEL_LZO=y # CONFIG_KERNEL_GZIP is not set CONFIG_KERNEL_LZMA=y # CONFIG_KERNEL_LZO is not set +CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -65,6 +64,7 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y CONFIG_GENERIC_HARDIRQS=y CONFIG_HAVE_SPARSE_IRQ=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_CHIP=y # CONFIG_SPARSE_IRQ is not set # @@ -78,7 +78,6 @@ CONFIG_TINY_RCU=y CONFIG_LOG_BUF_SHIFT=17 CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set -CONFIG_CGROUP_NS=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_DEVICE=y CONFIG_CPUSETS=y @@ -114,7 +113,6 @@ CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set -# CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y @@ -231,7 +229,6 @@ CONFIG_MMU=y # CONFIG_ARCH_FOOTBRIDGE is not set # CONFIG_ARCH_MXC is not set # CONFIG_ARCH_MXS is not set -# CONFIG_ARCH_STMP3XXX is not set # CONFIG_ARCH_NETX is not set # CONFIG_ARCH_H720X is not set # CONFIG_ARCH_IOP13XX is not set @@ -248,7 +245,6 @@ CONFIG_MMU=y CONFIG_ARCH_ORION5X=y # CONFIG_ARCH_MMP is not set # CONFIG_ARCH_KS8695 is not set -# CONFIG_ARCH_NS9XXX is not set # CONFIG_ARCH_W90X900 is not set # CONFIG_ARCH_NUC93X is not set # CONFIG_ARCH_TEGRA is not set @@ -261,7 +257,6 @@ CONFIG_ARCH_ORION5X=y # CONFIG_ARCH_S3C2410 is not set # CONFIG_ARCH_S3C64XX is not set # CONFIG_ARCH_S5P64X0 is not set -# CONFIG_ARCH_S5P6442 is not set # CONFIG_ARCH_S5PC100 is not set # CONFIG_ARCH_S5PV210 is not set # CONFIG_ARCH_EXYNOS4 is not set @@ -362,6 +357,7 @@ CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +CONFIG_HAVE_ARCH_PFN_VALID=y # CONFIG_HIGHMEM is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -377,6 +373,7 @@ CONFIG_VIRT_TO_BUS=y CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_NEED_PER_CPU_KM=y +# CONFIG_CLEANCACHE is not set CONFIG_FORCE_MAX_ZONEORDER=11 # CONFIG_LEDS is not set CONFIG_ALIGNMENT_TRAP=y @@ -388,6 +385,7 @@ CONFIG_UACCESS_WITH_MEMCPY=y # # Boot options # +# CONFIG_USE_OF is not set CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="" @@ -824,6 +822,7 @@ CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_DRR=m CONFIG_NET_SCH_MQPRIO=m CONFIG_NET_SCH_CHOKE=m +# CONFIG_NET_SCH_QFQ is not set CONFIG_NET_SCH_INGRESS=m # @@ -973,6 +972,7 @@ CONFIG_WIMAX_DEBUG_LEVEL=8 CONFIG_RFKILL=m CONFIG_RFKILL_LEDS=y CONFIG_RFKILL_INPUT=y +# CONFIG_RFKILL_REGULATOR is not set CONFIG_NET_9P=m CONFIG_NET_9P_RDMA=m # CONFIG_NET_9P_DEBUG is not set @@ -1001,7 +1001,6 @@ CONFIG_CONNECTOR=m CONFIG_MTD=y # CONFIG_MTD_DEBUG is not set # CONFIG_MTD_TESTS is not set -CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set CONFIG_MTD_CMDLINE_PARTS=y # CONFIG_MTD_AFS_PARTS is not set @@ -1146,6 +1145,7 @@ CONFIG_ATA_OVER_ETH=m CONFIG_MISC_DEVICES=y # CONFIG_AD525X_DPOT is not set # CONFIG_PHANTOM is not set +# CONFIG_INTEL_MID_PTI is not set CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m @@ -1448,7 +1448,6 @@ CONFIG_CICADA_PHY=m CONFIG_VITESSE_PHY=m CONFIG_SMSC_PHY=m CONFIG_BROADCOM_PHY=m -# CONFIG_BCM63XX_PHY is not set CONFIG_ICPLUS_PHY=m CONFIG_REALTEK_PHY=m CONFIG_NATIONAL_PHY=m @@ -1519,11 +1518,11 @@ CONFIG_ATH5K_PCI=y CONFIG_ATH9K_HW=m CONFIG_ATH9K_COMMON=m CONFIG_ATH9K=m +# CONFIG_ATH9K_PCI is not set +# CONFIG_ATH9K_AHB is not set # CONFIG_ATH9K_DEBUGFS is not set CONFIG_ATH9K_RATE_CONTROL=y # CONFIG_ATH9K_HTC is not set -CONFIG_AR9170_USB=m -CONFIG_AR9170_LEDS=y # CONFIG_CARL9170 is not set CONFIG_B43=m CONFIG_B43_PCI_AUTOSELECT=y @@ -1566,6 +1565,7 @@ CONFIG_IWLAGN=m # # CONFIG_IWLWIFI_DEBUG is not set # CONFIG_IWLWIFI_DEVICE_TRACING is not set +# CONFIG_IWLWIFI_DEVICE_SVTOOL is not set # CONFIG_IWL_P2P is not set CONFIG_IWLWIFI_LEGACY=m @@ -1598,23 +1598,25 @@ CONFIG_RT73USB=m CONFIG_RT2800USB=m # CONFIG_RT2800USB_RT33XX is not set # CONFIG_RT2800USB_RT35XX is not set +# CONFIG_RT2800USB_RT53XX is not set # CONFIG_RT2800USB_UNKNOWN is not set CONFIG_RT2800_LIB=m CONFIG_RT2X00_LIB_PCI=m CONFIG_RT2X00_LIB_USB=m CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_HT=y CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set # CONFIG_RTL8192CE is not set +# CONFIG_RTL8192SE is not set # CONFIG_RTL8192CU is not set CONFIG_WL1251=m CONFIG_WL1251_SPI=m # CONFIG_WL12XX_MENU is not set CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set +# CONFIG_MWIFIEX is not set # # WiMAX Wireless Broadband devices @@ -1656,6 +1658,7 @@ CONFIG_USB_EPSON2888=y CONFIG_USB_KC2190=y CONFIG_USB_NET_ZAURUS=m # CONFIG_USB_NET_CX82310_ETH is not set +# CONFIG_USB_NET_KALMIA is not set CONFIG_USB_HSO=m CONFIG_USB_NET_INT51X1=m CONFIG_USB_CDC_PHONET=m @@ -1720,8 +1723,6 @@ CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y CONFIG_CAPI_TRACE=y CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_CAPI20=m -CONFIG_ISDN_CAPI_CAPIFS_BOOL=y -CONFIG_ISDN_CAPI_CAPIFS=m # # CAPI hardware drivers @@ -1783,6 +1784,7 @@ CONFIG_INPUT_EVDEV=m # CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ADP5588=m +# CONFIG_KEYBOARD_ADP5589 is not set CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_QT1070 is not set # CONFIG_KEYBOARD_QT2160 is not set @@ -1793,6 +1795,7 @@ CONFIG_KEYBOARD_GPIO=m CONFIG_KEYBOARD_LM8323=m CONFIG_KEYBOARD_MAX7359=m # CONFIG_KEYBOARD_MCS is not set +# CONFIG_KEYBOARD_MPR121 is not set # CONFIG_KEYBOARD_NEWTON is not set CONFIG_KEYBOARD_OPENCORES=m CONFIG_KEYBOARD_STOWAWAY=m @@ -1861,6 +1864,7 @@ CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_GUNZE=m CONFIG_TOUCHSCREEN_ELO=m CONFIG_TOUCHSCREEN_WACOM_W8001=m +# CONFIG_TOUCHSCREEN_MAX11801 is not set CONFIG_TOUCHSCREEN_MCS5000=m CONFIG_TOUCHSCREEN_MTOUCH=m CONFIG_TOUCHSCREEN_INEXIO=m @@ -1940,6 +1944,7 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y # CONFIG_SERIAL_NONSTANDARD is not set CONFIG_NOZOMI=m # CONFIG_N_GSM is not set +# CONFIG_TRACE_SINK is not set # CONFIG_DEVKMEM is not set # @@ -1966,6 +1971,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_ALTERA_UART is not set # CONFIG_SERIAL_IFX6X60 is not set # CONFIG_SERIAL_PCH_UART is not set +# CONFIG_SERIAL_XILINX_PS_UART is not set # CONFIG_PRINTER is not set # CONFIG_PPDEV is not set # CONFIG_HVC_DCC is not set @@ -2083,13 +2089,18 @@ CONFIG_PPS=m # # PPS generators support # + +# +# PTP clock support +# +# CONFIG_PTP_1588_CLOCK is not set CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_GPIOLIB=y # CONFIG_DEBUG_GPIO is not set CONFIG_GPIO_SYSFS=y # -# Memory mapped GPIO expanders: +# Memory mapped GPIO drivers: # # CONFIG_GPIO_BASIC_MMIO is not set # CONFIG_GPIO_IT8761E is not set @@ -2134,6 +2145,7 @@ CONFIG_W1_CON=y CONFIG_W1_MASTER_MATROX=m CONFIG_W1_MASTER_DS2490=m CONFIG_W1_MASTER_DS2482=m +# CONFIG_W1_MASTER_DS1WM is not set # CONFIG_W1_MASTER_GPIO is not set # @@ -2141,11 +2153,13 @@ CONFIG_W1_MASTER_DS2482=m # CONFIG_W1_SLAVE_THERM=m CONFIG_W1_SLAVE_SMEM=m +# CONFIG_W1_SLAVE_DS2408 is not set # CONFIG_W1_SLAVE_DS2423 is not set CONFIG_W1_SLAVE_DS2431=m CONFIG_W1_SLAVE_DS2433=m # CONFIG_W1_SLAVE_DS2433_CRC is not set CONFIG_W1_SLAVE_DS2760=m +# CONFIG_W1_SLAVE_DS2780 is not set CONFIG_W1_SLAVE_BQ27000=m # CONFIG_POWER_SUPPLY is not set CONFIG_HWMON=y @@ -2202,8 +2216,10 @@ CONFIG_SENSORS_LTC4245=m # CONFIG_SENSORS_LTC4261 is not set CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_MAX1111=m +# CONFIG_SENSORS_MAX16065 is not set # CONFIG_SENSORS_MAX1619 is not set # CONFIG_SENSORS_MAX6639 is not set +# CONFIG_SENSORS_MAX6642 is not set CONFIG_SENSORS_MAX6650=m # CONFIG_SENSORS_PC87360 is not set CONFIG_SENSORS_PC87427=m @@ -2216,6 +2232,7 @@ CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_DME1737=m # CONFIG_SENSORS_EMC1403 is not set # CONFIG_SENSORS_EMC2103 is not set +# CONFIG_SENSORS_EMC6W201 is not set # CONFIG_SENSORS_SMSC47M1 is not set CONFIG_SENSORS_SMSC47M192=m # CONFIG_SENSORS_SMSC47B397 is not set @@ -2276,6 +2293,12 @@ CONFIG_SSB_B43_PCI_BRIDGE=y # CONFIG_SSB_DEBUG is not set CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y CONFIG_SSB_DRIVER_PCICORE=y +CONFIG_BCMA_POSSIBLE=y + +# +# Broadcom specific AMBA +# +# CONFIG_BCMA is not set CONFIG_MFD_SUPPORT=y CONFIG_MFD_CORE=m # CONFIG_MFD_88PM860X is not set @@ -2289,6 +2312,7 @@ CONFIG_HTC_PASIC3=m # CONFIG_TPS6105X is not set CONFIG_TPS65010=m # CONFIG_TPS6507X is not set +# CONFIG_MFD_TPS6586X is not set # CONFIG_TWL4030_CORE is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_TC3589X is not set @@ -2305,18 +2329,18 @@ CONFIG_MFD_WM8400=m # CONFIG_MFD_WM8350_I2C is not set # CONFIG_MFD_WM8994 is not set CONFIG_MFD_PCF50633=m -# CONFIG_MFD_MC13XXX is not set CONFIG_PCF50633_ADC=m CONFIG_PCF50633_GPIO=m +# CONFIG_MFD_MC13XXX is not set # CONFIG_ABX500_CORE is not set # CONFIG_EZX_PCAP is not set # CONFIG_MFD_TIMBERDALE is not set CONFIG_LPC_SCH=m # CONFIG_MFD_RDC321X is not set # CONFIG_MFD_JANZ_CMODIO is not set -# CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_VX855 is not set # CONFIG_MFD_WL1273_CORE is not set +# CONFIG_MFD_TPS65910 is not set CONFIG_REGULATOR=y # CONFIG_REGULATOR_DEBUG is not set # CONFIG_REGULATOR_DUMMY is not set @@ -2365,6 +2389,7 @@ CONFIG_IR_RC5_SZ_DECODER=m CONFIG_IR_LIRC_CODEC=m # CONFIG_IR_IMON is not set # CONFIG_IR_MCEUSB is not set +CONFIG_IR_REDRAT3=m # CONFIG_IR_STREAMZAP is not set # CONFIG_RC_LOOPBACK is not set CONFIG_MEDIA_ATTACH=y @@ -2389,6 +2414,7 @@ CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m CONFIG_MEDIA_TUNER_MAX2165=m CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_TDA18212=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEOBUF_GEN=m CONFIG_VIDEOBUF_DMA_SG=m @@ -2405,7 +2431,7 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_VIDEO_IR_I2C=m # -# Audio decoders +# Audio decoders, processors and mixers # CONFIG_VIDEO_TVAUDIO=m CONFIG_VIDEO_TDA7432=m @@ -2415,7 +2441,6 @@ CONFIG_VIDEO_TEA6420=m CONFIG_VIDEO_MSP3400=m CONFIG_VIDEO_CS5345=m CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_M52790=m CONFIG_VIDEO_WM8775=m CONFIG_VIDEO_WM8739=m CONFIG_VIDEO_VP27SMPX=m @@ -2432,17 +2457,15 @@ CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m CONFIG_VIDEO_BT866=m CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_MT9V011=m CONFIG_VIDEO_SAA7110=m CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_SAA717X=m CONFIG_VIDEO_TVP5150=m CONFIG_VIDEO_VPX3220=m # # Video and audio decoders # +CONFIG_VIDEO_SAA717X=m CONFIG_VIDEO_CX25840=m # @@ -2458,11 +2481,22 @@ CONFIG_VIDEO_SAA7185=m CONFIG_VIDEO_ADV7170=m CONFIG_VIDEO_ADV7175=m +# +# Camera sensor devices +# +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_MT9V011=m + # # Video improvement chips # CONFIG_VIDEO_UPD64031A=m CONFIG_VIDEO_UPD64083=m + +# +# Miscelaneous helper chips +# +CONFIG_VIDEO_M52790=m CONFIG_VIDEO_BT848=m CONFIG_VIDEO_BT848_DVB=y CONFIG_VIDEO_BWQCAM=m @@ -2530,6 +2564,7 @@ CONFIG_USB_GSPCA_CONEX=m CONFIG_USB_GSPCA_ETOMS=m CONFIG_USB_GSPCA_FINEPIX=m CONFIG_USB_GSPCA_JEILINJ=m +# CONFIG_USB_GSPCA_KINECT is not set # CONFIG_USB_GSPCA_KONICA is not set CONFIG_USB_GSPCA_MARS=m CONFIG_USB_GSPCA_MR97310A=m @@ -2588,7 +2623,6 @@ CONFIG_USB_S2255=m # CONFIG_V4L_MEM2MEM_DRIVERS is not set CONFIG_RADIO_ADAPTERS=y # CONFIG_RADIO_MAXIRADIO is not set -# CONFIG_RADIO_MAESTRO is not set CONFIG_I2C_SI4713=m CONFIG_RADIO_SI4713=m # CONFIG_USB_DSBR is not set @@ -2758,6 +2792,7 @@ CONFIG_DVB_SP8870=m CONFIG_DVB_SP887X=m CONFIG_DVB_CX22700=m CONFIG_DVB_CX22702=m +CONFIG_DVB_DRXD=m CONFIG_DVB_L64781=m CONFIG_DVB_TDA1004X=m CONFIG_DVB_NXT6000=m @@ -2770,6 +2805,7 @@ CONFIG_DVB_DIB7000P=m CONFIG_DVB_TDA10048=m CONFIG_DVB_AF9013=m CONFIG_DVB_STV0367=m +CONFIG_DVB_CXD2820R=m # # DVB-C (cable) frontends @@ -2867,6 +2903,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_ATY128 is not set # CONFIG_FB_ATY is not set CONFIG_FB_S3=m +# CONFIG_FB_S3_DDC is not set # CONFIG_FB_SAVAGE is not set # CONFIG_FB_SIS is not set # CONFIG_FB_NEOMAGIC is not set @@ -2887,12 +2924,14 @@ CONFIG_FB_SM501=m CONFIG_FB_METRONOME=m CONFIG_FB_MB862XX=m CONFIG_FB_MB862XX_PCI_GDC=y +# CONFIG_FB_MB862XX_I2C is not set # CONFIG_FB_BROADSHEET is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_LCD_CLASS_DEVICE is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set # CONFIG_BACKLIGHT_ADP8860 is not set +# CONFIG_BACKLIGHT_ADP8870 is not set # CONFIG_BACKLIGHT_PCF50633 is not set # @@ -3003,6 +3042,7 @@ CONFIG_SND_HDSPM=m # CONFIG_SND_INTEL8X0 is not set # CONFIG_SND_INTEL8X0M is not set # CONFIG_SND_KORG1212 is not set +# CONFIG_SND_LOLA is not set CONFIG_SND_LX6464ES=m # CONFIG_SND_MAESTRO3 is not set # CONFIG_SND_MIXART is not set @@ -3045,12 +3085,10 @@ CONFIG_USB_HIDDEV=y # # Special HID drivers # -# CONFIG_HID_3M_PCT is not set CONFIG_HID_A4TECH=m # CONFIG_HID_ACRUX is not set CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m -# CONFIG_HID_CANDO is not set CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m # CONFIG_HID_PRODIKEYS is not set @@ -3073,7 +3111,6 @@ CONFIG_LOGIRUMBLEPAD2_FF=y # CONFIG_LOGIG940_FF is not set # CONFIG_LOGIWII_FF is not set CONFIG_HID_MICROSOFT=m -# CONFIG_HID_MOSART is not set CONFIG_HID_MONTEREY=m # CONFIG_HID_MULTITOUCH is not set CONFIG_HID_NTRIG=m @@ -3091,7 +3128,6 @@ CONFIG_HID_PETALYNX=m # CONFIG_HID_ROCCAT_PYRA is not set CONFIG_HID_SAMSUNG=m CONFIG_HID_SONY=m -# CONFIG_HID_STANTUM is not set CONFIG_HID_SUNPLUS=m CONFIG_HID_GREENASIA=m CONFIG_GREENASIA_FF=y @@ -3144,6 +3180,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_UHCI_HCD=m CONFIG_USB_U132_HCD=m CONFIG_USB_SL811_HCD=m +# CONFIG_USB_SL811_HCD_ISO is not set CONFIG_USB_R8A66597_HCD=m CONFIG_USB_WHCI_HCD=m CONFIG_USB_HWA_HCD=m @@ -3236,7 +3273,6 @@ CONFIG_USB_SERIAL_SPCP8X5=m CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m # CONFIG_USB_SERIAL_SAFE_PADDED is not set -# CONFIG_USB_SERIAL_SAMBA is not set CONFIG_USB_SERIAL_SIEMENS_MPI=m CONFIG_USB_SERIAL_SIERRAWIRELESS=m CONFIG_USB_SERIAL_SYMBOL=m @@ -3318,6 +3354,7 @@ CONFIG_LEDS_CLASS=y # # CONFIG_LEDS_LM3530 is not set CONFIG_LEDS_PCA9532=m +# CONFIG_LEDS_PCA9532_GPIO is not set CONFIG_LEDS_GPIO=y CONFIG_LEDS_GPIO_PLATFORM=y CONFIG_LEDS_LP3944=m @@ -3398,10 +3435,13 @@ CONFIG_RTC_DRV_S35390A=y CONFIG_RTC_DRV_FM3130=m CONFIG_RTC_DRV_RX8581=m CONFIG_RTC_DRV_RX8025=m +# CONFIG_RTC_DRV_EM3027 is not set +# CONFIG_RTC_DRV_RV3029C2 is not set # # SPI RTC drivers # +# CONFIG_RTC_DRV_M41T93 is not set CONFIG_RTC_DRV_M41T94=m CONFIG_RTC_DRV_DS1305=m CONFIG_RTC_DRV_DS1390=m @@ -3459,18 +3499,15 @@ CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m # CONFIG_UIO_NETX is not set CONFIG_STAGING=y -# CONFIG_STAGING_EXCLUDE_BUILD is not set # CONFIG_ET131X is not set # CONFIG_VIDEO_GO7007 is not set # CONFIG_VIDEO_CX25821 is not set # CONFIG_VIDEO_TM6000 is not set -# CONFIG_USB_IP_COMMON is not set +# CONFIG_USBIP_CORE is not set # CONFIG_W35UND is not set # CONFIG_PRISM2_USB is not set # CONFIG_ECHO is not set -# CONFIG_BRCM80211 is not set -# CONFIG_RT2870 is not set -# CONFIG_COMEDI is not set +# CONFIG_BRCMUTIL is not set # CONFIG_ASUS_OLED is not set # CONFIG_PANEL is not set # CONFIG_R8187SE is not set @@ -3529,6 +3566,7 @@ CONFIG_SPEAKUP_SYNTH_DUMMY=m # Altera FPGA firmware download module # # CONFIG_ALTERA_STAPL is not set +CONFIG_CLKSRC_MMIO=y # # File systems @@ -3581,7 +3619,7 @@ CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_NILFS2_FS=m CONFIG_FS_POSIX_ACL=y -CONFIG_EXPORTFS=y +CONFIG_EXPORTFS=m CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y @@ -3642,6 +3680,7 @@ CONFIG_PROC_PAGE_MONITOR=y CONFIG_SYSFS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y # CONFIG_HUGETLB_PAGE is not set CONFIG_CONFIGFS_FS=m CONFIG_MISC_FILESYSTEMS=y @@ -3739,7 +3778,6 @@ CONFIG_CIFS_POSIX=y CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_FSCACHE is not set # CONFIG_CIFS_ACL is not set -CONFIG_CIFS_EXPERIMENTAL=y CONFIG_NCP_FS=m CONFIG_NCPFS_PACKET_SIGNING=y CONFIG_NCPFS_IOCTL_LOCKING=y @@ -3847,6 +3885,7 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_LOCKUP_DETECTOR is not set # CONFIG_HARDLOCKUP_DETECTOR is not set CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 CONFIG_SCHED_DEBUG=y @@ -3867,6 +3906,7 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set CONFIG_STACKTRACE=y +# CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set @@ -3924,7 +3964,6 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_STRICT_DEVMEM is not set CONFIG_ARM_UNWIND=y # CONFIG_DEBUG_USER is not set -# CONFIG_DEBUG_STACK_USAGE is not set CONFIG_DEBUG_LL=y CONFIG_EARLY_PRINTK=y # CONFIG_DEBUG_ICEDCC is not set @@ -4079,7 +4118,6 @@ CONFIG_BINARY_PRINTF=y # CONFIG_RAID6_PQ=m CONFIG_BITREVERSE=y -CONFIG_GENERIC_FIND_LAST_BIT=y CONFIG_CRC_CCITT=m CONFIG_CRC16=y CONFIG_CRC_T10DIF=y diff --git a/core/kernel26-orion/kernel26.install b/core/linux-orion/linux-orion.install similarity index 79% rename from core/kernel26-orion/kernel26.install rename to core/linux-orion/linux-orion.install index df4348f99..6e87547f5 100644 --- a/core/kernel26-orion/kernel26.install +++ b/core/linux-orion/linux-orion.install @@ -1,7 +1,10 @@ -KERNEL_NAME=-orion -KERNEL_VERSION=2.6.39-orion +# arg 1: the new package version +# arg 2: the old package version -post_install() { +KERNEL_NAME=-orion +KERNEL_VERSION=3.0-orion + +patch_kernel() { if [ -e "etc/machid.bin" ]; then echo "Saved machine type found. Patching Kernel" cp etc/machid.bin tmp/machid @@ -70,19 +73,28 @@ post_install() { echo "Generating uImage" mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -d tmp/machid boot/uImage rm tmp/machid +} - # Just making sure kernel modules still work after we moved to .gz - /sbin/depmod ${KERNEL_VERSION} +post_install () { + patch_kernel + + # updating module dependencies + echo ">>> Updating module dependencies. Please wait ..." + depmod ${KERNEL_VERSION} } post_upgrade() { - post_install -} + patch_kernel -post_remove() { - KERNEL_VERSION=2.6.39-orion -} + 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 " This is most likely not what you want. Please mount your /boot" + echo " partition and reinstall the kernel unless you are sure this is OK" + fi + fi -op=$1 -shift -$op $* + # updating module dependencies + echo ">>> Updating module dependencies. Please wait ..." + depmod ${KERNEL_VERSION} +}