diff options
| author | Oyvind Repvik <nail@nslu2-linux.org> | 2005-08-09 21:29:17 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-09 21:29:17 +0000 |
| commit | 8d23f63a1b479a5a90f9f18add690807d2a5a96b (patch) | |
| tree | 2f1bf53eea8c5582c1c155d7ada810bce007d869 | |
| parent | 22efe91ae5de78d47bc30d1296b2a61a7fc8a72b (diff) | |
| parent | e7fde65924851f3c4cd3cda6ce685a3ab0619005 (diff) | |
merge of a76f350b51bedef01b414ca428726bc656900e86
and f1d9c506311c18e24649910f85d49714dadc9e98
| -rw-r--r-- | conf/distro/openslug-packages.conf | 2 | ||||
| -rw-r--r-- | packages/linux/nslu2-kernel_2.6.12.2.bb | 2 | ||||
| -rw-r--r-- | packages/linux/openslug-kernel-2.6.12.2/defconfig | 2 | ||||
| -rw-r--r-- | packages/meta/openslug-packages.bb | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index f1a031075c..a782f31b08 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -20,6 +20,7 @@ ${PKGDIR}/packages/ccxstream/*.bb \ ${PKGDIR}/packages/coreutils/*.bb \ ${PKGDIR}/packages/cpio/*.bb \ ${PKGDIR}/packages/cron/*.bb \ +${PKGDIR}/packages/ctorrent/*.bb \ ${PKGDIR}/packages/cvs/*.bb \ ${PKGDIR}/packages/cyrus-imapd/*.bb \ ${PKGDIR}/packages/cyrus-sasl/*.bb \ @@ -145,7 +146,6 @@ ${PKGDIR}/packages/screen/*.bb \ ${PKGDIR}/packages/sed/*.bb \ ${PKGDIR}/packages/setpwc/*.bb \ ${PKGDIR}/packages/slugimage/*.bb \ -${PKGDIR}/packages/softdog/*.bb \ ${PKGDIR}/packages/strace/*.bb \ ${PKGDIR}/packages/streamripper/*.bb \ ${PKGDIR}/packages/sudo/*.bb \ diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb index 64b5788649..177fa8cb3f 100644 --- a/packages/linux/nslu2-kernel_2.6.12.2.bb +++ b/packages/linux/nslu2-kernel_2.6.12.2.bb @@ -1,5 +1,5 @@ # Kernel for NSLU2 -PR = "r7" +PR = "r8" include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include diff --git a/packages/linux/openslug-kernel-2.6.12.2/defconfig b/packages/linux/openslug-kernel-2.6.12.2/defconfig index fef846fe33..2e60b1f22a 100644 --- a/packages/linux/openslug-kernel-2.6.12.2/defconfig +++ b/packages/linux/openslug-kernel-2.6.12.2/defconfig @@ -332,7 +332,7 @@ CONFIG_BLK_DEV_SD=y # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs # -# CONFIG_SCSI_MULTI_LUN is not set +CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 533f188795..18a626c94a 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -54,6 +54,7 @@ OPENSLUG_PACKAGES = "\ ccxstream \ coreutils \ cron \ + ctorrent \ cvs\ cyrus-imapd \ db4 \ |