diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-02-19 10:28:18 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-19 10:28:18 +0000 |
| commit | ba81094a28b35db729737a391e266c92ecf588e4 (patch) | |
| tree | 8ba5f87b4a90cb1e379a828ddab1bb210d0c5aaf | |
| parent | df523bbcf6601a041b801ecceeb2cfd5616fe728 (diff) | |
| parent | 205288a508c6677bccf6aa9ba5dc5fef623bbf67 (diff) | |
merge of de843404287b36479dc45ace9ce134cef2ab6e93
and f101befff140631d2a4b3081922d2d30610604cf
| -rw-r--r-- | conf/distro/slugos-packages.conf | 1 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.16/defconfig | 2 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.15.3.bb (renamed from packages/linux/ixp4xx-kernel_2.6.15.2.bb) | 4 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.16-rc2.bb | 2 | ||||
| -rw-r--r-- | packages/meta/slugos-packages.bb | 1 |
5 files changed, 6 insertions, 4 deletions
diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf index 28b85cd57e..b9ac309a60 100644 --- a/conf/distro/slugos-packages.conf +++ b/conf/distro/slugos-packages.conf @@ -146,6 +146,7 @@ ${PKGDIR}/packages/nano/*.bb \ ${PKGDIR}/packages/ncftp/*.bb \ ${PKGDIR}/packages/ncurses/*.bb \ ${PKGDIR}/packages/netbase/*.bb \ +${PKGDIR}/packages/netcat/*.bb \ ${PKGDIR}/packages/netpbm/*.bb \ ${PKGDIR}/packages/nfs-utils/*.bb \ ${PKGDIR}/packages/nis/*.bb \ diff --git a/packages/linux/ixp4xx-kernel/2.6.16/defconfig b/packages/linux/ixp4xx-kernel/2.6.16/defconfig index e7973518c7..0862199528 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.16/defconfig @@ -1596,7 +1596,7 @@ CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y # CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set -# CONFIG_CODA_FS is not set +CONFIG_CODA_FS=m # CONFIG_AFS_FS is not set # CONFIG_9P_FS is not set diff --git a/packages/linux/ixp4xx-kernel_2.6.15.2.bb b/packages/linux/ixp4xx-kernel_2.6.15.3.bb index 10163296b6..d62147392c 100644 --- a/packages/linux/ixp4xx-kernel_2.6.15.2.bb +++ b/packages/linux/ixp4xx-kernel_2.6.15.3.bb @@ -3,12 +3,12 @@ # Increment PR_CONFIG for changes to the ixp4xx-kernel specific # defconfig (do *NOT* increment anything in here for changes # to other kernel configs!) -PR_CONFIG = "1" +PR_CONFIG = "0" # # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r2.${PR_CONFIG}" +PR = "r0.${PR_CONFIG}" include ixp4xx-kernel.inc diff --git a/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb b/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb index 6369eb9abc..a034fca982 100644 --- a/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb +++ b/packages/linux/ixp4xx-kernel_2.6.16-rc2.bb @@ -3,7 +3,7 @@ # Increment PR_CONFIG for changes to the ixp4xx-kernel specific # defconfig (do *NOT* increment anything in here for changes # to other kernel configs!) -PR_CONFIG = "1" +PR_CONFIG = "2" # # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index d4b3830e6e..f4d8dbf30b 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -109,6 +109,7 @@ SLUGOS_PACKAGES = "\ nano \ ncftp \ ncurses \ + netcat \ netpbm \ nmap \ ntp \ |