diff options
| author | Justin Patrin <papercrane@gmail.com> | 2006-01-20 06:07:28 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-20 06:07:28 +0000 |
| commit | 682392d5a31f31de779b6556829a7451dbf6e8d8 (patch) | |
| tree | 799661b2c7d5b05ef1874bb69a5697d020404b74 /conf | |
| parent | 9993d1748f9ef5c52aa0d6e3d3e0295248b921c6 (diff) | |
| parent | ea99bc2a74329de257bd3471bd13f47b36ed861f (diff) | |
merge of 4d5b94a92602e5e257fa068651ecc2760fd67b44
and cccbd67a0ede7ae4d1db1f9c45f544ed28d0b294
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/slugos-packages.conf | 2 | ||||
| -rw-r--r-- | conf/distro/slugos.conf | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf index efafe698dd..98dfb5cff1 100644 --- a/conf/distro/slugos-packages.conf +++ b/conf/distro/slugos-packages.conf @@ -106,6 +106,7 @@ ${PKGDIR}/packages/libvorbis/*.bb \ ${PKGDIR}/packages/libxml/*.bb \ ${PKGDIR}/packages/linux-libc-headers/*.bb \ ${PKGDIR}/packages/linux/*.bb \ +${PKGDIR}/packages/lirc/*.bb \ ${PKGDIR}/packages/lrzsz/*.bb \ ${PKGDIR}/packages/lsof/*.bb \ ${PKGDIR}/packages/lzo/*.bb \ @@ -182,6 +183,7 @@ ${PKGDIR}/packages/sane-backends/*.bb \ ${PKGDIR}/packages/screen/*.bb \ ${PKGDIR}/packages/sed/*.bb \ ${PKGDIR}/packages/setpwc/*.bb \ +${PKGDIR}/packages/setserial/*.bb \ ${PKGDIR}/packages/sgml-common/*.bb \ ${PKGDIR}/packages/slugimage/*.bb \ ${PKGDIR}/packages/slugos-init/*.bb \ diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 58e2ab65c7..0bedaa7f71 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -163,7 +163,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" # Select the correct versions of the kernel and modules (these are the # defaults, override in the conf/distro top-level distro file). PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" -PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.15" +PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.15.1" # Built-in ethernet modules PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth" |