diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/openslug-packages.conf | 2 | ||||
| -rw-r--r-- | conf/distro/unslung.conf | 15 | ||||
| -rw-r--r-- | conf/machine/h2200.conf | 11 |
3 files changed, 16 insertions, 12 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index ea126d9032..0c743ef64f 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -58,6 +58,7 @@ ${PKGDIR}/packages/glibc/*.bb \ ${PKGDIR}/packages/gnu-config/*.bb \ ${PKGDIR}/packages/gphoto2/*.bb \ ${PKGDIR}/packages/grep/*.bb \ +${PKGDIR}/packages/groff/*.bb \ ${PKGDIR}/packages/gtk-doc/*.bb \ ${PKGDIR}/packages/gzip/*.bb \ ${PKGDIR}/packages/hal/*.bb \ @@ -84,6 +85,7 @@ ${PKGDIR}/packages/libdvb/*.bb \ ${PKGDIR}/packages/libexif/*.bb \ ${PKGDIR}/packages/libgphoto2/*.bb \ ${PKGDIR}/packages/libgsm/*.bb \ +${PKGDIR}/packages/libiconv/*.bb \ ${PKGDIR}/packages/libid3tag/*.bb \ ${PKGDIR}/packages/liblockfile/*.bb \ ${PKGDIR}/packages/libmad/*.bb \ diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index 22b041f521..1777135a0d 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -3,11 +3,11 @@ #@DESCRIPTION: Unslung Linux Distribution for the NSLU2 DISTRO_NAME = "Unslung" -DISTRO_VERSION = "5.6-beta" +DISTRO_VERSION = "6.2-alpha" DISTRO_TYPE = "beta" FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable" -FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable" +FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/native/stable" FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/stable" # pull in the frozen list of bbfiles @@ -57,8 +57,9 @@ PREFERRED_VERSION_glibc-initial ?= "2.2.5" PREFERRED_VERSION_binutils ?= "2.15.94.0.1" PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" -PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r29" -PREFERRED_VERSION_unslung-rootfs ?= "2.3r29" -PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r29" -PREFERRED_VERSION_nslu2-linksys-libs ?= "2.3r29" -PREFERRED_VERSION_nslu2-linksys-ramdisk ?= "2.3r29" +PREFERRED_PROVIDER_virtual/kernel ?= "unslung-kernel" +PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r63" +PREFERRED_VERSION_unslung-rootfs ?= "2.3r63" +PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63" +PREFERRED_VERSION_nslu2-linksys-libs ?= "2.3r63" +PREFERRED_VERSION_nslu2-linksys-ramdisk ?= "2.3r63" diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 973364ebf7..4dc502209a 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -9,17 +9,18 @@ IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa h2200" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" -EXTRA_IMAGECMD_jffs2 = "--pad --no-cleanmarkers --pagesize=4096 --eraseblock=16384" +EXTRA_IMAGECMD_h2200_jffs2 = "--pad --no-cleanmarkers --pagesize=512 --eraseblock=16384" ROOT_FLASH_SIZE = "32" -BOOTSTRAP_EXTRA_DEPENDS_append = "h2200-bootloader handhelds-pxa-2.6 udev module-init-tools" +BOOTSTRAP_EXTRA_DEPENDS_append = " h2200-bootloader handhelds-pxa-2.6 udev module-init-tools" -BOOTSTRAP_EXTRA_RDEPENDS = "h2200-bootloader ${@linux_module_packages('${H2200_MODULES}', d)}" +BOOTSTRAP_EXTRA_RDEPENDS = " h2200-bootloader kernel ${@linux_module_packages('${H2200_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" #ship in rootfs: -H2200_MODULES = "g_ether g_serial g_file_storage sa1100-rtc apm pcmcia-core snd-pcm-oss snd-pxa-i2sound-h2200 pxa2xx_h2200 h2200_pm h2200_lcd h2200_kbd h2200_battery mq11xx_base mq1100fb samcop_adcts w1_ds2760 w1_samcop " +H2200_MODULES = "g_ether g_serial g_file_storage sa1100-rtc apm pcmcia-core snd-pcm-oss snd-pxa2xx-i2sound pxa2xx_h2200 h2200_pm h2200_lcd h2200_kbd h2200_battery mq11xx_base mq1100fb samcop_adcts w1_ds2760 w1_samcop " + #autoload on boot: module_autoload_h2200_pm = "h2200_pm" @@ -33,7 +34,7 @@ module_autoload_w1_ds2760 = "w1_ds2760" module_autoload_h2200_battery = "h2200_battery" module_autoload_hamcop_nand = "hamcop_nand" module_autoload_pxa2xx_h2200 = "pxa2xx_h2200" -module_autoload_snd_pxa_i2sound_h2200 = "snd-pxa-i2sound-h2200" +module_autoload_snd-pxa2xx-i2sound= "snd-pxa2xx-i2sound" module_autoload_snd-pcm-oss = "snd-pcm-oss" SERIAL_CONSOLE = "115200 tts/0 vt100" |