From 071abd6766328d0f82323a5b7e390a18906379df Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 29 Apr 2013 11:23:00 +0200 Subject: [PATCH] Rename kernel pkg to linux3.8 and update it to 3.8.10. --- srcpkgs/kernel-headers | 1 - .../patches/i915-fix-ghost-tv-output.patch | 26 ---------------- srcpkgs/linux3.8-headers | 1 + .../{kernel => linux3.8}/files/i386-dotconfig | 0 .../files/x86_64-dotconfig | 0 srcpkgs/{kernel => linux3.8}/template | 30 +++++++++---------- 6 files changed, 16 insertions(+), 42 deletions(-) delete mode 120000 srcpkgs/kernel-headers delete mode 100644 srcpkgs/kernel/patches/i915-fix-ghost-tv-output.patch create mode 120000 srcpkgs/linux3.8-headers rename srcpkgs/{kernel => linux3.8}/files/i386-dotconfig (100%) rename srcpkgs/{kernel => linux3.8}/files/x86_64-dotconfig (100%) rename srcpkgs/{kernel => linux3.8}/template (91%) diff --git a/srcpkgs/kernel-headers b/srcpkgs/kernel-headers deleted file mode 120000 index 36c8c047ca..0000000000 --- a/srcpkgs/kernel-headers +++ /dev/null @@ -1 +0,0 @@ -kernel \ No newline at end of file diff --git a/srcpkgs/kernel/patches/i915-fix-ghost-tv-output.patch b/srcpkgs/kernel/patches/i915-fix-ghost-tv-output.patch deleted file mode 100644 index 3cd1d4c6a3..0000000000 --- a/srcpkgs/kernel/patches/i915-fix-ghost-tv-output.patch +++ /dev/null @@ -1,26 +0,0 @@ -Signed-off-by: Zhao Yakui -Tested-by: Santi ---- - drivers/gpu/drm/i915/intel_tv.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c -index dc83b7a..c8f67bf 100644 ---- drivers/gpu/drm/i915/intel_tv.c -+++ drivers/gpu/drm/i915/intel_tv.c -@@ -1267,6 +1267,15 @@ - DAC_B_0_7_V | - DAC_C_0_7_V); - -+ /* -+ * The TV sense state should be cleared to zero on cantiga platform. Otherwise -+ * the TV is misdetected. This is hardware requirement. -+ */ -+ if (IS_GM45(dev)) -+ tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL | -+ TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL); -+ -+ - I915_WRITE(TV_CTL, tv_ctl); - I915_WRITE(TV_DAC, tv_dac); - POSTING_READ(TV_DAC); diff --git a/srcpkgs/linux3.8-headers b/srcpkgs/linux3.8-headers new file mode 120000 index 0000000000..58922964f9 --- /dev/null +++ b/srcpkgs/linux3.8-headers @@ -0,0 +1 @@ +linux3.8 \ No newline at end of file diff --git a/srcpkgs/kernel/files/i386-dotconfig b/srcpkgs/linux3.8/files/i386-dotconfig similarity index 100% rename from srcpkgs/kernel/files/i386-dotconfig rename to srcpkgs/linux3.8/files/i386-dotconfig diff --git a/srcpkgs/kernel/files/x86_64-dotconfig b/srcpkgs/linux3.8/files/x86_64-dotconfig similarity index 100% rename from srcpkgs/kernel/files/x86_64-dotconfig rename to srcpkgs/linux3.8/files/x86_64-dotconfig diff --git a/srcpkgs/kernel/template b/srcpkgs/linux3.8/template similarity index 91% rename from srcpkgs/kernel/template rename to srcpkgs/linux3.8/template index a0e6d03386..4a9d4bfc04 100644 --- a/srcpkgs/kernel/template +++ b/srcpkgs/linux3.8/template @@ -1,15 +1,15 @@ -# Template file for 'kernel' +# Template file for 'linux3.8' # -pkgname=kernel -version=3.8.9 +pkgname=linux3.8 +version=3.8.10 revision=1 wrksrc="linux-${version}" maintainer="Juan RP " homepage="http://www.kernel.org" license="GPL-2" -short_desc="The Linux kernel and modules" +short_desc="The Linux kernel and modules (3.8 series)" distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz" -checksum=8f1b38e24a1b5805b01218928436e531b47c383a41ac052bf040fd74de730e64 +checksum=b748dcdda0448dea1970b95a8cd76d718723816ead77e9b74b6b6e1f72be125a makedepends="perl kmod>=11_2 openssl which elfutils" _kernver="${version}_${revision}" @@ -61,18 +61,16 @@ do_install() { hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver} install -Dm644 .config ${DESTDIR}/boot/config-${_kernver} - install -Dm644 arch/x86/boot/bzImage \ - ${DESTDIR}/boot/vmlinuz-${_kernver} - install -Dm644 System.map \ - ${DESTDIR}/boot/System.map-${_kernver} + install -Dm644 arch/x86/boot/bzImage ${DESTDIR}/boot/vmlinuz-${_kernver} + install -Dm644 System.map ${DESTDIR}/boot/System.map-${_kernver} # Switch to /usr. vmkdir usr mv ${DESTDIR}/lib ${DESTDIR}/usr - cd ${DESTDIR}/usr/lib/modules/${_kernver} && \ - rm -f source build && \ - ln -sf ../../../src/kernel-headers-${_kernver} build + cd ${DESTDIR}/usr/lib/modules/${_kernver} + rm -f source build + ln -sf ../../../src/kernel-headers-${_kernver} build cd ${wrksrc} # Install required headers to build external modules @@ -85,7 +83,9 @@ do_install() { for i in acpi asm-generic config crypto drm generated linux math-emu \ media net pcmcia scsi sound trace uapi video xen; do - [ -d include/$i ] && cp -a include/$i ${hdrdest}/include + if [ -d include/$i ]; then + cp -a include/$i ${hdrdest}/include + fi done cd ${wrksrc} @@ -183,7 +183,7 @@ do_install() { depmod -b ${DESTDIR}/usr -F System.map ${_kernver} } -kernel-headers_package() { +linux3.8-headers_package() { preserve=yes nostrip=yes noverifyrdeps=yes @@ -194,7 +194,7 @@ kernel-headers_package() { } } -kernel_package() { +linux3.8_package() { nostrip=yes noverifyrdeps=yes preserve=yes