karasz
/
package-update
1
0
Fork 0
Code Issues Releases Activity
Browse Source

* updated linux-header (2.6.18.4 -> 2.6.19.2) 

* merged r20080, r20082, r20157 from linux-2.6.19.2 branch


git-svn-id: svn://svn.opensde.net/opensde/package/trunk@20547 10447126-35f2-4685-b0cf-6dd780d3921f
early
Christian Wiese 18 years ago
parent
d5071c95dc
commit
e82eb498e1
4 changed files with 16 additions and 125 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 83
      base/linux-header/linux-header.conf
  2. 8
      base/linux-header/linux-header.desc
  3. 26
      base/linux-header/not-remove-include.patch
  4. 24
      develop/unifdef/pkg_linux-header_pre.conf

83
base/linux-header/linux-header.conf
Unescape View File

@ -3,7 +3,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../linux-header/linux-header.conf
# Copyright (C) 2006 The OpenSDE Project
# Copyright (C) 2006 - 2007 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
@ -29,81 +29,22 @@ fi
# patch
hook_add premake 2 "lx_patch"
# WARNING: HACK ALERT!
# change the timestamp of the headers to be newer than the currently installed
# ones to really install them
hook_add premake 8 "find include -type f -exec touch '{}' \;"
# and disable `make all` at the last-minute
hook_add premake 9 "export makeopt="
makeinstopt="$makeopt"
var_append makeinstopt ' ' "INSTALL_HDR_PATH=$root/$prefix"
var_append makeinstopt ' ' "headers_install"
###############################################################################
# #
# Note: The following old custmain related code is left for later research #
# #
###############################################################################
main_lx_header() {
lx_patch
# we need to create an config since this generates some files
yes '' | eval $MAKE oldconfig > /dev/null
# WARNING: preventing the removal of existing header files
# if we do not set those variables empty _all_ header files in /usr/include
# are kindly removed!
var_append makeinstopt ' ' "oldheaders= unwanted="
# install the header files - and do some post-processing for sparc
rm -rf $root/$prefix/include/{asm,asm-generic,linux,sound,asm-sparc,asm-sparc64}
mkdir -p $root/$prefix/include
case $arch in
sparc64)
# we can only generate this files when we have a cross compiler
# which is stage 1 and above ...
if ! atstage toolchain && [ $treever != 26 ] ; then
# build two generated headers first ...
make ARCH=sparc CROSS_COMPILE=$archprefix KCC=$KCC \
arch/sparc/kernel/Makefile check_asm
make ARCH=sparc64 CROSS_COMPILE=$archprefix KCC=$KCC \
arch/sparc64/kernel/Makefile check_asm
fi
cp -rv include/asm-sparc{,64} $root/$prefix/include/
sh $base/package/*/linux-header/generate-asm $root/$prefix/include \
sparc sparc64 __arch64__
;;
x86-64)
cp -rv include/asm-{i386,x86_64} $root/$prefix/include/
sh $base/package/*/linux-header/generate-asm $root/$prefix/include \
i386 x86_64 __x86_64__
;;
powerpc64)
cp -rv include/asm-{ppc,ppc64} $root/$prefix/include/
sh $base/package/*/linux-header/generate-asm $root/$prefix/include \
ppc ppc64 __PPC64__
;;
sh64)
cp -rv include/asm-{sh,sh64} $root/$prefix/include/
sh $base/package/*/linux-header/generate-asm $root/$prefix/include \
sh sh64 __LP64__
;;
*)
mkdir -p $root/$prefix/include/asm
cp -rv include/asm/* $root/$prefix/include/asm/
;;
esac
cp -rv include/{asm-generic,linux,sound} $root/$prefix/include/
# network related kernel headers
mkdir -p $root/$prefix/include/net
# needed by ipvsadm2
cp -v include/net/ip_vs.h $root/$prefix/include/net/
# needed by snort
cp -v include/net/{dst.h,inetpeer.h,flow.h} $root/$prefix/include/net/
}
# autopatch=0 ; createdocs=0
# patchfiles="$base/package/$repository/linux$treever/*.patch $patchfiles"
# custmain="main_lx_header"
var_append makeinstopt ' ' "headers_install"
###############################################################################
# #
# End of the old custmain related code #
# #
###############################################################################

8
base/linux-header/linux-header.desc
Unescape View File

@ -3,7 +3,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../linux-header/linux-header.desc
[COPY] Copyright (C) 2006 The OpenSDE Project
[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2003 Clifford Wolf
[COPY]
@ -33,12 +33,12 @@
[L] GPL
[S] Stable
[V] 2.6.18.4
[V] 2.6.19.2
# in theory we only need the initial headers (stage 0) however some arches
# generate some and need a compiler to do so (SPARC) so we do rebuild them
# in stage 1 ...
[P] X 01-------9 100.300
[D] 1833570624 linux-2.6.18.tar.bz2 http://ftp.kernel.org/pub/linux/kernel/v2.6/
[D] 2722181384 patch-2.6.18.4.bz2 http://www.kernel.org/pub/linux/kernel/v2.6/
[D] 4108217827 linux-2.6.19.tar.bz2 http://ftp.kernel.org/pub/linux/kernel/v2.6/
[D] 1900964792 patch-2.6.19.2.bz2 http://www.kernel.org/pub/linux/kernel/v2.6/

26
base/linux-header/not-remove-include.patch
Unescape View File

@ -1,26 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../linux-header/not-remove-include.patch
# Copyright (C) 2006 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./Makefile.orig 2006-09-20 22:27:21.000000000 +0200
+++ ./Makefile 2006-09-20 22:27:54.000000000 +0200
@@ -895,7 +895,6 @@
PHONY += headers_install
headers_install: include/linux/version.h
$(Q)unifdef -Ux /dev/null
- $(Q)rm -rf $(INSTALL_HDR_PATH)/include
$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include
PHONY += headers_check

24
develop/unifdef/pkg_linux-header_pre.conf
Unescape View File

@ -1,24 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../unifdef/pkg_linux-header_pre.conf
# Copyright (C) 2006 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
if ! type -p unifdef > /dev/null; then
echo_status "Including unifdef on the toolchain."
unifdef_tooldir() {
tar -C $builddir -v $taropt `match_source_file -p . unifdef`
$HOSTCC $builddir/unifdef-*/unifdef.c -o $base/build/$SDECFG_ID/TOOLCHAIN/$toolsdir/bin/unifdef
}
hook_add premake 3 'unifdef_tooldir'
fi
Write Preview
Loading…
Cancel
Save