stock Kernel == vanilla Kernel ?

triplefault · 2006-10-10 15:03:58

Hi

is there a difference between the stock/ftp upgraded kernel26 and then vanilla (ftp.kernel.org) Kernel, are there any patches aplied with the ARCH version ? I mean if both have the same version number ?

triple fault

Lone_Wolf · 2006-10-10 15:19:55

This is the pkgbuild for the stock kernel, as you can see there are several patches apllied.

# $Id: PKGBUILD,v 1.171 2006/10/07 10:07:19 tpowa Exp $
# Maintainer: judd <jvinet>
pkgname=kernel26
basekernel=2.6.18
pkgver=2.6.18
pkgrel=7
pkgdesc="The Linux Kernel and modules"
arch=(i686 x86_64)
url="http://www.kernel.org"
backup=('boot/kconfig26')
depends=('module-init-tools' 'mkinitcpio>=0.5.7')
# pwc, ieee80211 and hostap-driver26 modules are included in kernel26 now
# nforce package support was abandoned by nvidia, kernel modules should cover everything now.
# kernel24 support is dropped since glibc24
replaces=('kernel24' 'kernel24-scsi' 'kernel26-scsi' 'alsa-driver' 'ieee80211' 'hostap-driver26' 'pwc' 'nforce')
install=kernel26.install
source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$basekernel.tar.bz2 
  #http://www.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 
  #http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2 
  #http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.18-rc6-git1.bz2 
  ftp://152.104.238.194/cn/nic/r1000_v1.04.tgz 
  config config.x86_64 logo_linux_clut224.ppm logo_linux_mono.pbm logo_linux_vga16.ppm 
  mkinitcpio-$pkgname.conf 
  #ftp://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/patches/release/$basekernel/acpi-release-20060310-$basekernel.diff.bz2 
  acpi-dsdt-initrd-v0.8.2-2.6.18.patch r1000-build.patch jmicron-ide.patch wacom-volito.patch)
md5sums=('296a6d150d260144639c3664d127d174' '95ffba4436fbb866a7e68809eac3bfb9'
         '77797a931701d98ab4115b96a80b3aa4' '3335d7db57bba196e9af04251c4bcc7c'
         '5a62bcc7e96601052c7405459b483826' 'ed6b42fea2f5d27f7eb920746ccc1ebb'
         'a995ec849ea43d3c89d607bbdd1e7d09' '8c579c72a4f7187de6b496aec88250ed'
         '51633dc6b0e7d78d4f3de86bf18f9228' '82fd4f8c08dff9e802013aaf0e00e3a0'
         '97884da6e8d66bb120b9766b421db102' 'ff00c830ee99412aca35e68b37d829a7')

build() {
  [ "${CARCH}" = "i686" ]   && KARCH=i386
  [ "${CARCH}" = "x86_64" ] && KARCH=x86_64

  cd $startdir/src/linux-$basekernel
  # add upstream patch from 2.6.18 series
  #patch -Np1 -i ../patch-2.6.18-rc6 || return 1
  #patch -Np1 -i ../patch-2.6.18-rc6-git1 || return 1
  #patch -Np1 -i ../patch-$pkgver || return 1
  # add acpi custom dsdt patch
  patch -Np1 -i ../acpi-dsdt-initrd-v0.8.2-2.6.18.patch || return 1
  # add support for jmicron ide devices
  patch -Np1 -i ../jmicron-ide.patch || return 1
  # fix wacom volito devices
  patch -Np0 -i ../wacom-volito.patch || return 1
  # remove the extraversion from Makefile
  #sed -i 's|^EXTRAVERSION = .*$|EXTRAVERSION =-rc6|g' Makefile
  sed -i 's|^EXTRAVERSION = .*$|EXTRAVERSION =|g' Makefile
  # Arch logo!
  cp ../logo_linux_clut224.ppm drivers/video/logo/
  cp ../logo_linux_mono.pbm drivers/video/logo/
  cp ../logo_linux_vga16.ppm drivers/video/logo/
if [ "$CARCH" == "x86_64" ]; then
  cat ../config.x86_64 >./.config
 else
  # get rid of the 'i' in i686
  carch=`echo $CARCH | sed 's|i||'`
  cat ../config | sed "s|#CARCH#|$carch|g" >./.config
fi
  # build the full kernel version to use in pathnames
  . ./.config
  #_kernver="2.6.18-rc6${CONFIG_LOCALVERSION}"
  _kernver="${basekernel}${CONFIG_LOCALVERSION}"
  # load configuration
  yes "" | make config
  # build!
  make bzImage modules || return 1
  mkdir -p $startdir/pkg/{lib/modules,boot}
  make INSTALL_MOD_PATH=$startdir/pkg modules_install || return 1
  cp System.map $startdir/pkg/boot/System.map26
  cp arch/$KARCH/boot/bzImage $startdir/pkg/boot/vmlinuz26    # for x86_64
  install -D -m644 Makefile 
    $startdir/pkg/usr/src/linux-${_kernver}/Makefile
  install -D -m644 kernel/Makefile 
    $startdir/pkg/usr/src/linux-${_kernver}/kernel/Makefile
  install -D -m644 .config 
    $startdir/pkg/usr/src/linux-${_kernver}/.config
  install -D -m644 .config $startdir/pkg/boot/kconfig26
  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/include

  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/kernel
  for i in acpi asm-generic asm-$KARCH config linux math-emu media net pcmcia scsi sound video; do
    cp -a include/$i $startdir/pkg/usr/src/linux-${_kernver}/include/
  done

  # copy files necessary for later builds, like nvidia and vmware
  cp Module.symvers $startdir/pkg/usr/src/linux-${_kernver}
  cp -a scripts $startdir/pkg/usr/src/linux-${_kernver}
  # fix permissions on scripts dir
  chmod og-w -R $startdir/pkg/usr/src/linux-${_kernver}/scripts
  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/.tmp_versions
  
  cp arch/$KARCH/Makefile $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/
  cp arch/$KARCH/Makefile.cpu $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/
  cp arch/$KARCH/kernel/asm-offsets.s $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/kernel/

  # add headers for lirc package
  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/drivers/media/video
  cp drivers/media/video/*.h  $startdir/pkg/usr/src/linux-${_kernver}/drivers/media/video/
  for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102 usbvideo zc0301; do
   mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/drivers/media/video/$i
   cp -a drivers/media/video/$i/*.h $startdir/pkg/usr/src/linux-${_kernver}/drivers/media/video/$i
  done
  # add dm headers
  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/drivers/md
  cp drivers/md/*.h  $startdir/pkg/usr/src/linux-${_kernver}/drivers/md
  # add inotify.h
  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/include/linux
  cp include/linux/inotify.h $startdir/pkg/usr/src/linux-${_kernver}/include/linux/
  # add CLUSTERIP file for iptables
  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/net/ipv4/netfilter/
  cp net/ipv4/netfilter/ipt_CLUSTERIP.c $startdir/pkg/usr/src/linux-${_kernver}/net/ipv4/netfilter/
  # copy in Kconfig files
  for i in `find . -name "Kconfig*"`; do 
    mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/`echo $i | sed 's|/Kconfig.*||'`
    cp $i $startdir/pkg/usr/src/linux-${_kernver}/$i
  done

  cd $startdir/pkg/usr/src/linux-${_kernver}/include && ln -s asm-$KARCH asm

  chown -R root.root $startdir/pkg/usr/src/linux-${_kernver}
  cd $startdir/pkg/lib/modules/${_kernver} && 
    (rm -f source build; ln -sf ../../../usr/src/linux-${_kernver} build)
  # for binary modules make prepare
  cd $startdir/pkg/lib/modules/${_kernver}/build
  make prepare
  # install fallback mkinitcpio.conf file for kernel
  install -m644 -D $startdir/src/mkinitcpio-$pkgname.conf $startdir/pkg/boot/mkinitcpio-$pkgname.conf
  # set correct depmod command for install
  sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/kernel26.install
  # install r1000 driver for newer realtek network cards
  cd $startdir/src/r1000_v1.04/
  patch -Np0 -i $startdir/src/r1000-build.patch || return 1
  make KDIR=$startdir/src/linux-$basekernel modules
   install -D -m644 $startdir/src/r1000_v1.04/src/r1000.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/net/r1000.ko

phrakture · 2006-10-10 15:21:30

http://cvs.archlinux.org/cgi-bin/viewcv … cvs-markup

There are some patches applied - mostly bug fixes though. We do not add features for the most part.

For instance, I see the following patches are uncommented:

r1000_v1.04.tgz
acpi-dsdt-initrd-v0.8.2-2.6.18.patch
r1000-build.patch
jmicron-ide.patch
wacom-volito.patch

triplefault · 2006-10-11 07:38:27

Hi phrakture
Hi Lone_Wolf

Thanks for your replies.
Is it save to apply the 2.6.19-RC1 patch from kernel.org to the stock kernel26 (2.6.18-7) ? I have trouble with my ICH7 based laptop (libata pata problems). 2.6.19-RC1 seems to solve most of them.

Triplefault

tomk · 2006-10-11 08:27:28

Safe? Maybe. rcX patches are "may be poorly tested, and may in fact not work at all", to qoute kernel.org. Remember to apply the patch to the 2.6.18 source, not 2.6.18.7.

If you're thinking of doing it the Arch way i.e. with a PKGBUILD (recommended), I'd suggest you use tpowa's 2.6.18-rc build as a starting point, changing version numbers and other details as required.

triplefault · 2006-10-12 06:55:49

I think I stay away from the 2.6.18 kernel series for now. It's too buggy in the moment for my system. It is rather sad that an kernel update f* up so much . Thanks anyway for your replies.
Any idea how I update/rewind to latest 2.6.17-X via pacman ?

tomk · 2006-10-12 08:28:54

triplefault wrote:

I think I stay away from the 2.6.18 kernel series for now. It's too buggy in the moment for my system.

Did you ask for help anywhere?

triplefault wrote:

Any idea how I update/rewind to latest 2.6.17-X via pacman ?

That could be more trouble than it's worth in the long run, but if you insist, it's available here:
http://ftp.surfnet.nl/pub/os/Linux/dist … t/os/i686/

triplefault · 2006-10-12 09:49:36

Well , I really don't know what to do :? ..
On LKML they seem to be aware about the libata bugs, and there are also many patches
avaliable which are in 2.6.19-RC1 or must be applied against 2.6.19-RC1 (if I understand that correctly).
So I am stuck.. Either I use the old 2.6.17 or the new 2.6.19-RC1 which might bring up other issues
Thanks for that link tomk.. maybe I'll try it

Sigi · 2006-10-12 10:22:17

triplefault wrote:

I think I stay away from the 2.6.18 kernel series for now. It's too buggy in the moment for my system. It is rather sad that an kernel update f* up so much

You still haven't lost a word about any bugs in 2.6.18. It's running fine here and I really want to help you...

triplefault · 2006-10-12 11:00:22

Hello Sigi

Here is my problem. My CD/DVD drive isn't recognized at once
I am at work now so I don't have any dmesg output by the hand, but here is a link to an LKML Post which exactly describes my trouble
http://marc.theaimsgroup.com/?l=linux-k … 118868&w=2
I've also have WLAN troubles but they can wait. First Things First

Arch Linux

#1 2006-10-10 15:03:58

stock Kernel == vanilla Kernel ?

#2 2006-10-10 15:19:55

Re: stock Kernel == vanilla Kernel ?

#3 2006-10-10 15:21:30

Re: stock Kernel == vanilla Kernel ?

#4 2006-10-11 07:38:27

Re: stock Kernel == vanilla Kernel ?

#5 2006-10-11 08:27:28

Re: stock Kernel == vanilla Kernel ?

#6 2006-10-12 06:55:49

Re: stock Kernel == vanilla Kernel ?

#7 2006-10-12 08:28:54

Re: stock Kernel == vanilla Kernel ?

#8 2006-10-12 09:49:36

Re: stock Kernel == vanilla Kernel ?

#9 2006-10-12 10:22:17

Re: stock Kernel == vanilla Kernel ?

#10 2006-10-12 11:00:22

Re: stock Kernel == vanilla Kernel ?

Board footer