kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add MESSAGE suggesting grub or lilo update. And to mention

Browse source 
that multiple Linux kernel packages can be installed at same time.

Change PKGNAME scheme to allow it to be installed multiple times
simultaneously.
Use PKG_PRESERVE so the Linux kernel can't get accidently deinstalled.

Add a variable to choose where to install (but not used yet,
due to some problems when LOCALBASE is /).

Set NO_MTREE.

Make sure the boot and lib/modules directories are created.

Increased kernel version to 2.6.6. Sorry changes no listed here.
See kernel.org for change logs.

Honor the USE_INET6 so CONFIG_IPV6 is set.

For default configurations (for modules, etc.) add
change CONFIG_DRM_I830= to module and add:
CONFIG_USB_OHCI_HCD=y
CONFIG_SND_USB_AUDIO=m
CONFIG_USB_AUDIO=m
This commit is contained in:
Jeremy C. Reed 2004-06-12 22:44:24 +00:00 committed by Thomas Klausner
parent 01e029b31b
commit f7d489569c
6 changed files with 69 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
linux-kernel/MESSAGE Normal file
View file

@ -0,0 +1,11 @@
===========================================================================
$NetBSD: MESSAGE,v 1.1 2004/06/12 22:44:24 jeremy-c-reed Exp $
The ${PKGBASE} package can be installed simultaneously with
other Linux kernel packages at the same time. You can manually remove
older versions with pkg_delete(8) when they aren't needed anymore.
Be sure to adjust your grub.conf and/or lilo.conf (and re-run lilo)
boot loader configuration as necessary for your system.
===========================================================================

37
linux-kernel/Makefile
View file

@ -1,28 +1,49 @@
# $NetBSD: Makefile,v 1.5 2004/03/07 06:46:17 jeremy-c-reed Exp $
# $NetBSD: Makefile,v 1.6 2004/06/12 22:44:24 jeremy-c-reed Exp $
.include "Makefile.common"
PKGNAME= linux-kernel-${LINUX_VERSION}
# The naming scheme allows it to be installed multiple times simultaneously
PKGNAME= linux-kernel${LINUX_VERSION}-${LINUX_VERSION}
COMMENT= The Linux kernel
BUILD_DEPENDS+= linux-module-init-tools-[0-9]*:../../wip/linux-module-init-tools
# This means that old linux-modutils aren't available for other kernel
#BUILD_DEPENDS+= linux-modutils-[0-9]*:../../wip/linux-modutils
# Don't let the Linux kernel get accidently deinstalled.
# XXX todo: fix pkg_info to not be so noisy about this
# XXX maybe say "Package preserve option is set" or ...?
PKG_PRESERVE= # defined
.include "../../mk/bsd.prefs.mk"
# Location of where boot/ and lib/modules directories are located.
# XXX do not use this yet
LINUXBASE?= ${PREFIX}
# XXX can not set LOCALBASE because
# PREFIX is used in patch for depmod
# PKG_TOOLS_BIN is changed
#LOCALBASE= /
NO_MTREE= YES
PLIST_SUBST+= LINUXBASE=${LINUXBASE}
MESSAGE_SUBST+= PKGBASE=${PKGBASE}
MAKE_DIRS+= ${LINUXBASE}/lib/modules
MAKE_DIRS+= ${LINUXBASE}/boot
do-build:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} bzImage && \
${SETENV} ${MAKE_ENV} ${GMAKE} modules
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/boot
${INSTALL_DATA_DIR} ${LINUXBASE}/boot
${CP} ${WRKSRC}/arch/${LOWER_ARCH}/boot/bzImage \
${PREFIX}/boot/bzImage-${LINUX_VERSION}
${LINUXBASE}/boot/bzImage-${LINUX_VERSION}
${CP} ${WRKSRC}/System.map \
${PREFIX}/boot/System.map-${LINUX_VERSION}
${LINUXBASE}/boot/System.map-${LINUX_VERSION}
${INSTALL_DATA} ${WRKSRC}/.config ${PREFIX}/boot/${PKGNAME}.config
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} modules_install
.include "../../mk/bsd.pkg.mk"
# FIXME Is this needed?
#CC= ${LOCALBASE}/gcc3/bin/gcc

16
linux-kernel/Makefile.common
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile.common,v 1.4 2004/03/07 06:46:17 jeremy-c-reed Exp $
# $NetBSD: Makefile.common,v 1.5 2004/06/12 22:44:24 jeremy-c-reed Exp $
LINUX_VERSION= 2.6.3
LINUX_VERSION= 2.6.6
DISTNAME= linux-${LINUX_VERSION}
CATEGORIES= misc
@ -17,19 +17,25 @@ ONLY_FOR_PLATFORM= Linux-*-*
USE_GNU_TOOLS+= make
PLIST_SUBST+= LINUX_VERSION=${LINUX_VERSION}
CFLAGS+= -I${WRKSRC}/include
MAKE_ENV+= INSTALL_MOD_PATH=${PREFIX}
MAKE_ENV+= INSTALL_MOD_PATH=${LINUXBASE}
DISTINFO_FILE?= ${.CURDIR}/../../wip/linux-kernel/distinfo
PATCHDIR?= ${.CURDIR}/../../wip/linux-kernel/patches
FILESDIR= ${.CURDIR}/../../wip/linux-kernel/files
.include "../../mk/bsd.prefs.mk"
BUILD_DEFS+= USE_INET6
# This configure is also needed for the linux-kernel-headers package
# so that include/linux/autoconf.h is generated.
# oldconfig is for regenerating after is appended too
do-configure:
cd ${WRKSRC} && \
yes "" | ${GMAKE} config && \
${CAT} ${FILESDIR}/extra-configs >> .config && \
yes "" | ${GMAKE} oldconfig && \
${CAT} ${FILESDIR}/extra-configs >> .config
.if defined(USE_INET6) && (${USE_INET6} == "YES")
echo "CONFIG_IPV6=y" >> ${WRKSRC}/.config
.endif
cd ${WRKSRC} && yes "" | ${GMAKE} oldconfig && \
${MV} ${WRKSRC}/.config ${WRKSRC}/.config.moved && \
${SED} -e '2c# Linux kernel .config configuration used for the ${PKGNAME} package.' ${WRKSRC}/.config.moved > ${WRKSRC}/.config

17
linux-kernel/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.4 2004/03/31 22:54:07 jeremy-c-reed Exp $
@comment $NetBSD: PLIST,v 1.5 2004/06/12 22:44:24 jeremy-c-reed Exp $
boot/System.map-${PKGVERSION}
boot/bzImage-${PKGVERSION}
boot/${PKGNAME}.config
@ -15,6 +15,7 @@ lib/modules/${PKGVERSION}/kernel/drivers/char/agp/sworks-agp.ko
lib/modules/${PKGVERSION}/kernel/drivers/char/agp/via-agp.ko
lib/modules/${PKGVERSION}/kernel/drivers/char/drm/gamma.ko
lib/modules/${PKGVERSION}/kernel/drivers/char/drm/i810.ko
lib/modules/${PKGVERSION}/kernel/drivers/char/drm/i830.ko
lib/modules/${PKGVERSION}/kernel/drivers/char/drm/mga.ko
lib/modules/${PKGVERSION}/kernel/drivers/char/drm/r128.ko
lib/modules/${PKGVERSION}/kernel/drivers/char/drm/radeon.ko
@ -30,18 +31,22 @@ lib/modules/${PKGVERSION}/kernel/drivers/net/plip.ko
lib/modules/${PKGVERSION}/kernel/drivers/net/ppp_generic.ko
lib/modules/${PKGVERSION}/kernel/drivers/net/slhc.ko
lib/modules/${PKGVERSION}/kernel/drivers/net/slip.ko
lib/modules/${PKGVERSION}/kernel/drivers/usb/class/audio.ko
lib/modules/${PKGVERSION}/kernel/fs/ntfs/ntfs.ko
lib/modules/${PKGVERSION}/kernel/net/bluetooth/bluetooth.ko
lib/modules/${PKGVERSION}/kernel/net/irda/irda.ko
lib/modules/${PKGVERSION}/kernel/sound/drivers/mpu401/snd-mpu401.ko
lib/modules/${PKGVERSION}/kernel/sound/usb/snd-usb-audio.ko
lib/modules/${PKGVERSION}/modules.alias
lib/modules/${PKGVERSION}/modules.ccwmap
lib/modules/${PKGVERSION}/modules.dep
lib/modules/${PKGVERSION}/modules.generic_string
lib/modules/${PKGVERSION}/modules.ieee1394map
lib/modules/${PKGVERSION}/modules.inputmap
lib/modules/${PKGVERSION}/modules.isapnpmap
lib/modules/${PKGVERSION}/modules.parportmap
lib/modules/${PKGVERSION}/modules.pcimap
lib/modules/${PKGVERSION}/modules.pnpbiosmap
lib/modules/${PKGVERSION}/modules.symbols
lib/modules/${PKGVERSION}/modules.usbmap
@dirrm lib/modules/${PKGVERSION}/kernel/sound/usb
@dirrm lib/modules/${PKGVERSION}/kernel/sound/drivers/mpu401
@dirrm lib/modules/${PKGVERSION}/kernel/sound/drivers
@dirrm lib/modules/${PKGVERSION}/kernel/sound
@ -50,6 +55,8 @@ lib/modules/${PKGVERSION}/modules.usbmap
@dirrm lib/modules/${PKGVERSION}/kernel/net
@dirrm lib/modules/${PKGVERSION}/kernel/fs/ntfs
@dirrm lib/modules/${PKGVERSION}/kernel/fs
@dirrm lib/modules/${PKGVERSION}/kernel/drivers/usb/class
@dirrm lib/modules/${PKGVERSION}/kernel/drivers/usb
@dirrm lib/modules/${PKGVERSION}/kernel/drivers/net
@dirrm lib/modules/${PKGVERSION}/kernel/drivers/message/i2o
@dirrm lib/modules/${PKGVERSION}/kernel/drivers/message
@ -62,5 +69,3 @@ lib/modules/${PKGVERSION}/modules.usbmap
@dirrm lib/modules/${PKGVERSION}/kernel/drivers
@dirrm lib/modules/${PKGVERSION}/kernel
@dirrm lib/modules/${PKGVERSION}
@dirrm lib/modules
@dirrm boot

6
linux-kernel/distinfo
View file

@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.4 2004/03/07 02:29:20 jeremy-c-reed Exp $
$NetBSD: distinfo,v 1.5 2004/06/12 22:44:24 jeremy-c-reed Exp $
SHA1 (linux-2.6.3.tar.bz2) = f78f51f23fa73866cef098b12bee139c6b7d8f08
Size (linux-2.6.3.tar.bz2) = 34271622 bytes
SHA1 (linux-2.6.6.tar.bz2) = 0f3dce6ac8628d3eb9029a8d0e607cee4c069944
Size (linux-2.6.6.tar.bz2) = 34896138 bytes
SHA1 (patch-aa) = d4d899f775def1c2e427d61fcb2b59c857c0be9e

5
linux-kernel/files/extra-configs
View file

@ -70,7 +70,7 @@ CONFIG_DRM_GAMMA=m
CONFIG_DRM_R128=m
CONFIG_DRM_RADEON=m
CONFIG_DRM_I810=m
CONFIG_DRM_I830=y
CONFIG_DRM_I830=m
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
CONFIG_BLK_DEV_LOOP=m
@ -89,3 +89,6 @@ CONFIG_INPUT_JOYDEV=m
CONFIG_MOUSE_SERIAL=m
CONFIG_SND_MPU401=m
CONFIG_NTFS_FS=m
CONFIG_USB_OHCI_HCD=y
CONFIG_SND_USB_AUDIO=m
CONFIG_USB_AUDIO=m