[arch-commits] CVS update of extra/kernels/kernel26ck (PKGBUILD)

Tom Killian tom at archlinux.org
Sat Aug 25 11:19:54 UTC 2007


    Date: Saturday, August 25, 2007 @ 07:19:54
  Author: tom
    Path: /home/cvs-extra/extra/kernels/kernel26ck

Modified: PKGBUILD (1.37 -> 1.38)

upgpkg: kernel26ck 2.6.22.5.ck1-1


----------+
 PKGBUILD |   80 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 41 insertions(+), 39 deletions(-)


Index: extra/kernels/kernel26ck/PKGBUILD
diff -u extra/kernels/kernel26ck/PKGBUILD:1.37 extra/kernels/kernel26ck/PKGBUILD:1.38
--- extra/kernels/kernel26ck/PKGBUILD:1.37	Thu Aug 23 14:28:44 2007
+++ extra/kernels/kernel26ck/PKGBUILD	Sat Aug 25 07:19:54 2007
@@ -23,7 +23,7 @@
         http://www.archlinux.org/~tpowa/alsa-patches/alsa-20070818.patch.bz2
         http://www.archlinux.org/~tpowa/alsa-patches/alsa-include-20070818.patch.bz2
       	#http://heanet.dl.sourceforge.net/sourceforge/squashfs/squashfs3.2-r2.tar.gz
-      	ftp://ftp.filesystems.org/pub/unionfs/unionfs-2.1/unionfs-2.1_for_2.6.22.1.diff.gz
+      	ftp://ftp.filesystems.org/pub/unionfs/unionfs-2.1/unionfs-2.1.2_for_2.6.22.4.diff.gz
 	config config.x86_64
 	logo_arch_ck_224.ppm
 	logo_linux_mono.pbm
@@ -38,29 +38,7 @@
         bluetooth-alsa.patch
         hibernate-saa7134.diff
         squashfs3.2-patch.bz2)
-md5sums=('2e230d005c002fb3d38a3ca07c0200d0'
-         '66b0085338f446bf42b407adb099517a'
-         '27544a58763bbd4ce497a77658af744a'
-         '493137566bc397ec762c86e64bd96849'
-         '98aa4f307ff657a26dfc24b1ae583804'
-         '0bde89ee0301d7dd5b204bf625e08a38'
-         '6334f2be64678ebeacceda2caac7b1e4'
-         '8a5359e5517cbe490f609d3c12cd9bf5'
-         '1f1f4db73c98eace9c0d7c61c544bee5'
-         '5cbbc19b02fa96e614877da9e7833a0d'
-         'ed6b42fea2f5d27f7eb920746ccc1ebb'
-         'a995ec849ea43d3c89d607bbdd1e7d09'
-         '3b333625635413a8e1466f764785e58a'
-         '8c579c72a4f7187de6b496aec88250ed'
-         '695d8578a0334fa9bb140917561f03d4'
-         '276f81528448a6f86b4935a8c38acdad'
-         '3ed791c3af3099489faf0d22cbcc55a8'
-         '50ba275e9796ac034bfdfd7b27c71eb3'
-         'bbc730a590d4e09b3d937b257e5a4bfe'
-         'f5bd3608306e0ede70c3b3bd8b5de53e'
-         '591a519865cbce3f365d6aaad48e912e'
-         '004c5d686dd70478f80fb6f075a6086b')
-
+                                                                                        
 build() {
   [ "${CARCH}" = "i686" ]   && KARCH=i386
   [ "${CARCH}" = "x86_64" ] && KARCH=x86_64
@@ -94,7 +72,7 @@
   # add squashfs
   patch -Np1 -i ../squashfs3.2-patch || return 1
   # add unionfs
-  patch -Np1 -i ../unionfs-2.1_for_2.6.22.1.diff || return 1
+  patch -Np1 -i ../unionfs-2.1.2_for_2.6.22.4.diff || return 1
 
   #remove the extraversion from Makefile
   sed -i 's|^EXTRAVERSION =.*$|EXTRAVERSION =|' Makefile  
@@ -116,6 +94,7 @@
   yes "" | make config
   #make oldconfig || return 1
   #make menuconfig || return 1
+  
   # build!
   make bzImage modules || return 1
   mkdir -p $startdir/pkg/{lib/modules,boot}
@@ -131,7 +110,8 @@
   install -D -m644 .config $startdir/pkg/boot/kconfig26ck
   mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/include
 
-  for i in acpi asm-{generic,i386,x86_64} config linux math-emu media net pcmcia scsi sound video; do
+  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
 
@@ -140,21 +120,18 @@
   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
-
-  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/kernel
+  mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/.tmp_versions
+  
   cp arch/$KARCH/Makefile $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/
-  if [ "$CARCH" = "i686" ]; then
-    cp arch/$KARCH/Makefile.cpu $startdir/pkg/usr/src/linux-${_kernver}/arch/$KARCH/
-  fi
+  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
+   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
@@ -168,7 +145,6 @@
   # add wireless headers                                                                                                                                                  
   mkdir -p $startdir/pkg/usr/src/linux-${_kernver}/net/mac80211/
   cp net/mac80211/*.h $startdir/pkg/usr/src/linux-${_kernver}/net/mac80211/
-
   # add vmlinux
   cp vmlinux $startdir/pkg/usr/src/linux-${_kernver}
   # copy in Kconfig files
@@ -177,6 +153,14 @@
     cp $i $startdir/pkg/usr/src/linux-${_kernver}/$i
   done
   
+  if [ "${KARCH}" = "i386" ]; then
+    mkdir ${startdir}/pkg/usr/src/linux-${_kernver}/include/asm-x86_64
+    cp -a include/asm-x86_64/tsc.h ${startdir}/pkg/usr/src/linux-${_kernver}/include/asm-x86_64
+  else
+    mkdir ${startdir}/pkg/usr/src/linux-${_kernver}/include/asm-i386
+    cp -a include/asm-i386/tsc.h ${startdir}/pkg/usr/src/linux-${_kernver}/include/asm-i386
+  fi
+
   cd $startdir/pkg/usr/src/linux-${_kernver}/include && ln -s asm-$KARCH asm
 
   chown -R root.root $startdir/pkg/usr/src/linux-${_kernver}
@@ -188,8 +172,26 @@
   # set correct depmod command for install
   sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/kernel26ck.install
   echo -e "# NEVER EDIT THIS FILE\nALL_kver='${_kernver}'" > ${startdir}/pkg/etc/mkinitcpio.d/kernel26ck.kver
-
-  # remove unneeded architectures
-  rm -rf $startdir/pkg/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
 }
-
+md5sums=('2e230d005c002fb3d38a3ca07c0200d0'
+         '66b0085338f446bf42b407adb099517a'
+         '27544a58763bbd4ce497a77658af744a'
+         '493137566bc397ec762c86e64bd96849'
+         '98aa4f307ff657a26dfc24b1ae583804'
+         '0bde89ee0301d7dd5b204bf625e08a38'
+         '8399ed3673434943ad1294738e4831fd'
+         '8a5359e5517cbe490f609d3c12cd9bf5'
+         '1f1f4db73c98eace9c0d7c61c544bee5'
+         '5cbbc19b02fa96e614877da9e7833a0d'
+         'ed6b42fea2f5d27f7eb920746ccc1ebb'
+         'a995ec849ea43d3c89d607bbdd1e7d09'
+         '3b333625635413a8e1466f764785e58a'
+         '8c579c72a4f7187de6b496aec88250ed'
+         '695d8578a0334fa9bb140917561f03d4'
+         '276f81528448a6f86b4935a8c38acdad'
+         '3ed791c3af3099489faf0d22cbcc55a8'
+         '50ba275e9796ac034bfdfd7b27c71eb3'
+         'bbc730a590d4e09b3d937b257e5a4bfe'
+         'f5bd3608306e0ede70c3b3bd8b5de53e'
+         '591a519865cbce3f365d6aaad48e912e'
+         '004c5d686dd70478f80fb6f075a6086b')




More information about the arch-commits mailing list