diff options
52 files changed, 1299 insertions, 283 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ab3604285b..70c4cd32aa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -107,6 +107,15 @@ Machines: poodle, c7x0, spitz, nokia770, qemuarm, qemux86, hx2xxx Interests: Kernels, Bitbake, Core OE infrastructure, Zaurus 2.6 Recipes: linux-openzaurus, udev, zaurusd, task-base +Person: Rolf 'Laibsch' Leggewie +Mail: OE-recipes@rolf.leggewie.biz +Website: http://oz.leggewie.org +Interests: Japanese on the Zaurus +Distros: openzaurus +Machines: collie +Recipes: anthy, nunome, uim*, granule, qpobox*, qte-font-unifont* +Recipes: qpf-unismall, poboxserver, imkit* + Person: Øyvind Repvik Mail: nail@nslu2-linux.org Machines: nslu2, fsg3, ixp4xx, n2100 diff --git a/classes/base.bbclass b/classes/base.bbclass index a9b61d26b1..4aaee3686c 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -382,6 +382,12 @@ python base_do_fetch() { raise bb.build.FuncFailed("Fetch failed: %s" % value) } +addtask fetchall +do_fetchall[recrdeptask] = "do_fetch" +python base_do_fetchall() { + bb.build.exec_task('do_fetch', d) +} + def oe_unpack_file(file, data, url = None): import bb, os if not url: @@ -741,7 +747,7 @@ python () { # Patch handling inherit patch -EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage do_rebuild +EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage do_rebuild do_fetchall MIRRORS[func] = "0" MIRRORS () { diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 8a2a03ca17..f0a721fd4a 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -6,7 +6,7 @@ # INHERIT += "packaged-staging" # # You also need ipkg-cl and ipkg-make-index installed on your host -# put stage-manager and ipkg-build from org.openembedded.packaged-staging/contrib/ in your $PATH +# put ipkg-build from org.openembedded.packaged-staging/contrib/ in your $PATH # BUGS: # * does not distinguish between -native, -cross and other packages @@ -23,6 +23,8 @@ inherit package +DEPENDS = "stagemanager-native" + DEPLOY_DIR_PSTAGE = "${DEPLOY_DIR}/pstage" PSTAGE_BUILD_CMD = "${IPKGBUILDCMD}" diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 8fb5ada118..0b512e8b7c 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -114,8 +114,8 @@ PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "ucli PREFERRED_VERSION_gcc ?= "4.1.1" PREFERRED_VERSION_gcc-cross ?= "4.1.1" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -PREFERRED_VERSION_binutils ?= "2.17" -PREFERRED_VERSION_binutils-cross ?= "2.17" +PREFERRED_VERSION_binutils ?= "2.17.50.0.1" +PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.1" PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" PREFERRED_VERSION_glibc ?= "2.5" PREFERRED_VERSION_glibc-intermediate ?= "2.5" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index a1132209ad..4b1aff017a 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -68,7 +68,7 @@ SRCDATE_minimo ?= "20050401" SRCDATE_mystun-server ?= "20060814" SRCDATE_olsrd ?= "20060814" SRCDATE_opencvs ?= "20060814" -SRCDATE_oprofile ?= "20060214" +SRCDATE_oprofile ?= "20061011" SRCDATE_portaudio ?= "20060814" SRCDATE_putty ?= "20060814" SRCDATE_python-cairo ?= "20060814" diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf index 2f21b4ee91..313db8b765 100644 --- a/conf/machine/h1910.conf +++ b/conf/machine/h1910.conf @@ -2,20 +2,29 @@ #@NAME: HP iPAQ H1910/H1915 #@DESCRIPTION: Machine configuration for the HP iPAQ H1910/H1915 -KERNEL ?= "kernel26" -OVERRIDES =. "${KERNEL}:" - +# +# Hardware-based properties +# TARGET_ARCH = "arm" -IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" require conf/machine/include/tune-xscale.conf -PREFERRED_PROVIDER_xserver = "xserver-kdrive" +VOLATILE_STORAGE_SIZE = "64" +ROOT_FLASH_SIZE = "32" +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget" -BOOTSTRAP_EXTRA_RDEPENDS = "udev apm apmd network-suspend-scripts modutils-collateral mtd-utils" -BOOTSTRAP_EXTRA_RRECOMMENDS += "" +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" +PCMCIA_MANAGER = "pcmciautils" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" EXTRA_IMAGECMD_h1910_jffs2 = "-e 0x4000 -p -n" -GUI_MACHINE_CLASS = "smallscreen" - +# +# Modules autoload and other boot properties +# +SERIAL_CONSOLE = "115200 ttyS0 vt100" diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 467c0c0e81..e3936a794b 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -2,8 +2,9 @@ #@NAME: HP iPAQ h22xx #@DESCRIPTION: Machine configuration for the HP iPAQ h22xx - +# # Hardware-based properties +# TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" @@ -11,13 +12,16 @@ IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" require conf/machine/include/tune-xscale.conf #Set some hints for metadata +VOLATILE_STORAGE_SIZE = "64" ROOT_FLASH_SIZE = "32" GUI_MACHINE_CLASS = "smallscreen" #Set features for task-base MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget" -# Software/package selection +# +# Software/packages selection +# PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" @@ -25,7 +29,9 @@ PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" MACHINE_EXTRA_RDEPENDS = "mtd-utils h2200-bootloader kernel" EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" +# # Modules autoload and other boot properties +# module_autoload_snd-pcm-oss = "snd-pcm-oss" SERIAL_CONSOLE = "115200 ttyS0 vt100" diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index e146860c76..14a9bb6ba5 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -2,15 +2,28 @@ #@NAME: Compaq iPAQ 36xx,Compaq iPAQ 37xx,Compaq iPAQ 38xx #@DESCRIPTION: Machine configuration for the Compaq iPAQ 36xx, Compaq iPAQ 37xx and Compaq iPAQ 38xx devices +# +# Hardware-based properties +# TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "ipaqsa" + +require conf/machine/include/tune-strongarm.conf + +# h3700, h3800 have 32, but let that be bonus +ROOT_FLASH_SIZE = "16" +# h3630 have 32Mb only +VOLATILE_STORAGE_SIZE = "64" +GUI_MACHINE_CLASS = "smallscreen" + +# +# Software/packages selection +# PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa" PREFERRED_VERSION_handhelds-sa ?= "2.4.19-rmk6-pxa1-hh42" -EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p" BOOTSTRAP_EXTRA_RDEPENDS = "alsa-driver kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}', d)}" - -ROOT_FLASH_SIZE = "16" +EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p" H3600_MODULES = "\ h3600-asic \ @@ -28,10 +41,10 @@ serial-h3800 \ usb-char \ usb-eth" +# +# Modules autoload and other boot properties +# USE_DEVFS = "1" USE_VT = "0" - -require conf/machine/include/tune-strongarm.conf - SERIAL_CONSOLE = "115200 ttySA0" diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index 17bb47811a..6e6717842d 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -2,22 +2,29 @@ #@NAME: HP iPAQ h4xxx #@DESCRIPTION: Machine configuration for the HP iPAQ h4xxx +# # Hardware-based properties +# TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "32" +VOLATILE_STORAGE_SIZE = "64" GUI_MACHINE_CLASS = "smallscreen" MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget" -# Software/package selection +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" +# # Modules autoload and other boot properties +# module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_g_ether = "g_ether" diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf index a7208209eb..0e9165903b 100644 --- a/conf/machine/h5xxx.conf +++ b/conf/machine/h5xxx.conf @@ -2,30 +2,32 @@ #@NAME: Compaq iPAQ 51xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx #@DESCRIPTION: Machine configuration for the Compaq iPAQ 51xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices - +# +# Hardware-based properties +# TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" -EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p" -ROOT_FLASH_SIZE = "32" +require conf/machine/include/tune-xscale.conf +ROOT_FLASH_SIZE = "32" +VOLATILE_STORAGE_SIZE = "64" +GUI_MACHINE_CLASS = "smallscreen" MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost" +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p" MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" -MACHINE_EXTRA__RRECOMMENDS = " \ - kernel-module-h5400_lcd \ - kernel-module-h5400_battery \ - " - - +MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \ + kernel-module-h5400_battery" +# +# Modules autoload and other boot properties +# SERIAL_CONSOLE = "115200 tts/0 vt100" - USE_VT = "0" - -GUI_MACHINE_CLASS = "smallscreen" - -require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 58fb5c7166..7c0710d6f1 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -15,15 +15,15 @@ MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscree MODUTILS = "26" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" -MACHINE_EXTRA__RRECOMMENDS = " kernel-module-nls_cp437 \ - kernel-module-nls_iso8859-1 \ - kernel-module-nls_utf8 \ - kernel-module-af_key \ - kernel-module-bsd_comp \ +MACHINE_EXTRA_RRECOMMENDS = " kernel-module-nls-cp437 \ + kernel-module-nls-iso8859-1 \ + kernel-module-nls-utf8 \ + kernel-module-af-key \ + kernel-module-bsd-comp \ kernel-module-i2c-pxa \ - kernel-module-htcuniversal_power \ - kernel-module-snd-htcuniversal_audio \ - kernel-module-htcuniversal_acx \ + kernel-module-htcuniversal-power \ + kernel-module-snd-htcuniversal-audio \ + kernel-module-htcuniversal-acx \ kernel-module-acx \ " diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index e12927772d..3067caada9 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -2,51 +2,51 @@ #@NAME: iPAQ hx47xx #@DESCRIPTION: Machine configuration for the hx4700 iPAQ with a pxa27x CPU +# +# Hardware-based properties +# TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270" -PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" - -PREFERRED_VERSION_orinoco-modules = "0.15rc1" - -ROOT_FLASH_SIZE = "80" -EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ - -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ - -e 256KiB -p" - -IMAGE_FSTYPES ?= "jffs2" +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +require conf/machine/include/tune-xscale.conf -MODUTILS = "26" +# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first +#require conf/machine/include/tune-iwmmxt.conf +ROOT_FLASH_SIZE = "80" +VOLATILE_STORAGE_SIZE = "64" +GUI_MACHINE_CLASS = "bigscreen" MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget" +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" PCMCIA_MANAGER = "pcmciautils" +MODUTILS = "26" +XSERVER = "xserver-kdrive-w100" + +PREFERRED_VERSION_orinoco-modules = "0.15rc1" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" -MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls_cp437 \ - kernel-module-nls_iso8859-1 \ - kernel-module-nls_utf8 \ - kernel-module-af_key \ +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ + kernel-module-nls-iso8859-1 \ + kernel-module-nls-utf8 \ + kernel-module-af-key \ kernel-module-i2c-pxa \ - kernel-module-hx4700_voltage \ - kernel-module-hx4700_acx \ - kernel-module-snd_hx4700_audio" - - -SERIAL_CONSOLE = "115200 ttyS0" + kernel-module-hx4700-voltage \ + kernel-module-hx4700-acx \ + kernel-module-snd-hx4700-audio" -GUI_MACHINE_CLASS = "bigscreen" -XSERVER = "xserver-kdrive-w100" - -# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -require conf/machine/include/tune-xscale.conf - -# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first -#require conf/machine/include/tune-iwmmxt.conf - +EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ + -e 256KiB -p" -#define which modules to load at boot +# +# Modules autoload and other boot properties +# module_autoload_evdev = "evdev" module_autoload_hx4700_power = "hx4700_power" module_autoload_pcmcia = "pcmcia" @@ -63,3 +63,5 @@ module_autoload_pxa27x_udc = "pxa27x_udc" #FIXME: this should be controlled by a userspace utility later. module_autoload_g_ether = "g_ether" + +SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/include/tune-arm920t.conf b/conf/machine/include/tune-arm920t.conf index 992f1923c6..373bf46727 100644 --- a/conf/machine/include/tune-arm920t.conf +++ b/conf/machine/include/tune-arm920t.conf @@ -1,3 +1,3 @@ PACKAGE_ARCH = "armv4t" -TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t -mcpu=arm920t" +TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" diff --git a/conf/machine/navman-icn330.conf b/conf/machine/navman-icn330.conf new file mode 100644 index 0000000000..fa1cbbaaf4 --- /dev/null +++ b/conf/machine/navman-icn330.conf @@ -0,0 +1,37 @@ +#@TYPE: Machine +#@NAME: Navman iCN 300 +#@DESCRIPTION: Machine configuration for the navman iCN 330 gps devicesx + +# see http://www.duff.dk/navman/ for more details + +# +# Hardware-based properties +# +TARGET_ARCH = "arm" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" + +#Compile with armv5te optimizations, incompatible with armv4(t) cpus +require conf/machine/include/tune-xscale.conf + +#Set some hints for metadata +VOLATILE_STORAGE_SIZE = "32" +GUI_MACHINE_CLASS = "smallscreen" + +#Set features for task-base +MACHINE_FEATURES = "kernel26 touchscreen apm alsa usbgadget" + +# +# Software/packages selection +# +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/kernel = "linux-navman" + + +# +# Modules autoload and other boot properties +# +module_autoload_snd-pcm-oss = "snd-pcm-oss" + +SERIAL_CONSOLE = "115200 ttyS0 vt100" +USE_VT = "0" + diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb index 62e468a014..0060d07877 100644 --- a/packages/angstrom/task-angstrom-x11.bb +++ b/packages/angstrom/task-angstrom-x11.bb @@ -25,7 +25,7 @@ RDEPENDS_angstrom-x11-base-depends := "\ RDEPENDS_angstrom-gpe-task-base := "\ matchbox \ xcursor-transparent-theme \ - rxvt-unicode \ +# rxvt-unicode \ matchbox-themes-gtk \ xst \ xhost \ @@ -36,7 +36,7 @@ RDEPENDS_angstrom-gpe-task-base := "\ gpe-session-scripts \ gpe-icons \ gpe-confd \ - gpe-autostarter \ +# gpe-autostarter \ libgtkstylus \ libgtkinput \ suspend-desktop \ @@ -79,7 +79,7 @@ RDEPENDS_angstrom-gpe-task-apps := "\ gpe-aerial \ gpe-soundbite \ rosetta \ - gpe-screenshot \ + gpe-scap \ gpe-windowlist" RDEPENDS_angstrom-gpe-task-games := "\ diff --git a/packages/clamav/clamav.inc b/packages/clamav/clamav.inc new file mode 100644 index 0000000000..2a09c52461 --- /dev/null +++ b/packages/clamav/clamav.inc @@ -0,0 +1,122 @@ +DESCRIPTION = "Clam AntiVirus is a GPL anti-virus toolkit for UNIX. The main \ +purpose of this software is the integration with mail servers (attachment \ +scanning)." +DESCRIPTION_${PN}-lib = "The dynamic library that is shared between all of \ +the Clam AntiVirus components" +DESCRIPTION_${PN}-freshclam = "An automatic virus signature update \ +application for Clam AntiVirus" +DESCRIPTION_${PN}-data = "Static antivirus signature database for Clam AntiVirus" +DESCRIPTION_${PN}-daemon = "An on-demand file scanning service for Clam AntiVirus" +HOMEPAGE = "http://www.clamav.net/" +SECTION = "network" +LICENSE = "GPL" +DEPENDS = "zlib bzip2 gmp" +RDEPENDS_${PN} = "${PN}-data" +RDEPENDS_${PN}-daemon = "${PN}-data" +RRECOMMENDS_${PN} = "${PN}-freshclam" +RRECOMMENDS_${PN}-daemon = "${PN}-freshclam" + +SRC_URI = "${SOURCEFORGE_MIRROR}/clamav/clamav-${PV}.tar.gz \ + file://cross-compile-fix.patch;patch=1 \ + file://libtool-fix.patch;patch=1 \ + file://clamav-daemon.init \ + file://clamav-freshclam.init \ + file://clamav-daemon.default \ + file://clamd.conf \ + file://freshclam.conf \ + file://volatiles.02_clamav-data \ + file://volatiles.03_clamav-daemon \ + file://volatiles.03_clamav-freshclam" + +inherit autotools update-rc.d binconfig + +# Don't check for clamav uid/gid - they don't exist on the host +# Put virus definitions in /var/lib not /usr/lib +EXTRA_OECONF = "--disable-clamav \ + --with-dbdir=${localstatedir}/lib/clamav" + +do_install_append() { + install -m 0755 -d ${D}${sysconfdir}/default/volatiles \ + ${D}${sysconfdir}/init.d ${D}${docdir}/clamav + + # Save the installed clamd.conf in the doc dir and then install our new one + install -m 0755 ${D}${sysconfdir}/clamd.conf ${D}${docdir}/clamav/clamd.conf.example + install -m 0755 ${WORKDIR}/clamd.conf ${D}${sysconfdir}/clamd.conf + + # Save the installed freshclam.conf in the doc dir and then install our new one + install -m 0755 ${D}${sysconfdir}/freshclam.conf ${D}${docdir}/clamav/freshclam.conf.example + + # Install our config files and init scripts + install -m 0755 ${WORKDIR}/freshclam.conf ${D}${sysconfdir}/freshclam.conf + install -m 0755 ${WORKDIR}/clamav-daemon.default ${D}${sysconfdir}/default/clamav-daemon + install -m 0755 ${WORKDIR}/clamav-daemon.init ${D}${sysconfdir}/init.d/clamav-daemon + install -m 0755 ${WORKDIR}/clamav-freshclam.init ${D}${sysconfdir}/init.d/clamav-freshclam + + # We need some /var directories + for i in 02_clamav-data 03_clamav-daemon 03_clamav-freshclam; do + install -m 0644 ${WORKDIR}/volatiles.$i ${D}${sysconfdir}/default/volatiles/$i + done + + # Move the clamav data to a non-volatile location, we'll symlink back + # If freshclam is running it'll break the link to this static data + # once it has succesfully downloaded an update + install -m 0755 -d ${D}${libdir} + mv ${D}${localstatedir}/lib/clamav ${D}${libdir} +} +do_stage () { + oe_libinstall -a -so libclamav ${STAGING_LIBDIR} + rm -f ${STAGING_LIBDIR}/libclamav.la + install -m 0644 libclamav/clamav.h ${STAGING_INCDIR} +} + +PACKAGES += "${PN}-freshclam ${PN}-daemon ${PN}-data ${PN}-lib" + +FILES_${PN} = "${bindir}/clamscan ${bindir}/sigtool ${bindir}/clamdscan" +FILES_${PN}-lib = "${libdir}/libclamav.so.*" +FILES_${PN}-freshclam = "${bindir}/freshclam \ + ${sysconfdir}/freshclam.conf \ + ${sysconfdir}/init.d/clamav-freshclam \ + ${sysconfdir}/default/volatiles/03_clamav-freshclam" +FILES_${PN}-daemon = "${sysconfdir}/clamd.conf \ + ${sbindir}/clamd \ + ${sysconfdir}/init.d/clamav-daemon \ + ${sysconfdir}/default/clamav-daemon \ + ${sysconfdir}/default/volatiles/03_clamav-daemon" +FILES_${PN}-data = "${libdir}/clamav/main.cvd \ + ${libdir}/clamav/daily.cvd \ + ${sysconfdir}/default/volatiles/02_clamav-data" +FILES_${PN}-dev += "${bindir}/clamav-config" + +# Add clamav's user and groups +pkg_postinst_${PN}-freshclam () { + grep -q clamav: /etc/group || addgroup clamav + grep -q clamav: /etc/passwd || \ + adduser --disabled-password --home=/var/lib/clamav/ --system \ + --ingroup clamav --no-create-home -g "ClamAV" clamav + /etc/init.d/populate-volatile.sh +} +pkg_postinst_${PN}-daemon () { + grep -q clamav: /etc/group || addgroup clamav + grep -q clamav: /etc/passwd || \ + adduser --disabled-password --home=/var/lib/clamav/ --system \ + --ingroup clamav --no-create-home -g "ClamAV" clamav + /etc/init.d/populate-volatile.sh +} +pkg_postinst_${PN}-data () { + grep -q clamav: /etc/group || addgroup clamav + grep -q clamav: /etc/passwd || \ + adduser --disabled-password --home=/var/lib/clamav/ --system \ + --ingroup clamav --no-create-home -g "ClamAV" clamav + /etc/init.d/populate-volatile.sh +} + +# Indicate that the default files are configuration files +CONFFILES_${PN}-daemon = "${sysconfdir}/clamd.conf \ + ${sysconfdir}/default/clamav-daemon" +CONFFILES_${PN}-freshclam = "${sysconfdir}/freshclam.conf" + +INITSCRIPT_PACKAGES = "${PN}-daemon ${PN}-freshclam" +INITSCRIPT_NAME_${PN}-daemon = "clamav-daemon" +INITSCRIPT_NAME_${PN}-freshclam = "clamav-freshclam" +INITSCRIPT_PARAMS_${PN}-daemon = "defaults 50 50" +INITSCRIPT_PARAMS_${PN}-freshclam = "defaults 50 50" diff --git a/packages/clamav/clamav_0.88.4.bb b/packages/clamav/clamav_0.88.4.bb index 9cb432d579..2d980440fa 100644 --- a/packages/clamav/clamav_0.88.4.bb +++ b/packages/clamav/clamav_0.88.4.bb @@ -1,123 +1,3 @@ -DESCRIPTION = "Clam AntiVirus is a GPL anti-virus toolkit for UNIX. The main \ -purpose of this software is the integration with mail servers (attachment \ -scanning)." -DESCRIPTION_${PN}-lib = "The dynamic library that is shared between all of \ -the Clam AntiVirus components" -DESCRIPTION_${PN}-freshclam = "An automatic virus signature update \ -application for Clam AntiVirus" -DESCRIPTION_${PN}-data = "Static antivirus signature database for Clam AntiVirus" -DESCRIPTION_${PN}-daemon = "An on-demand file scanning service for Clam AntiVirus" -HOMEPAGE = "http://www.clamav.net/" -SECTION = "network" -LICENSE = "GPL" -DEPENDS = "zlib bzip2 gmp" -RDEPENDS_${PN} = "${PN}-data" -RDEPENDS_${PN}-daemon = "${PN}-data" -RRECOMMENDS_${PN} = "${PN}-freshclam" -RRECOMMENDS_${PN}-daemon = "${PN}-freshclam" -PR = "r6" - -SRC_URI = "${SOURCEFORGE_MIRROR}/clamav/clamav-${PV}.tar.gz \ - file://cross-compile-fix.patch;patch=1 \ - file://libtool-fix.patch;patch=1 \ - file://clamav-daemon.init \ - file://clamav-freshclam.init \ - file://clamav-daemon.default \ - file://clamd.conf \ - file://freshclam.conf \ - file://volatiles.02_clamav-data \ - file://volatiles.03_clamav-daemon \ - file://volatiles.03_clamav-freshclam" - -inherit autotools update-rc.d binconfig - -# Don't check for clamav uid/gid - they don't exist on the host -# Put virus definitions in /var/lib not /usr/lib -EXTRA_OECONF = "--disable-clamav \ - --with-dbdir=${localstatedir}/lib/clamav" - -do_install_append() { - install -m 0755 -d ${D}${sysconfdir}/default/volatiles \ - ${D}${sysconfdir}/init.d ${D}${docdir}/clamav - - # Save the installed clamd.conf in the doc dir and then install our new one - install -m 0755 ${D}${sysconfdir}/clamd.conf ${D}${docdir}/clamav/clamd.conf.example - install -m 0755 ${WORKDIR}/clamd.conf ${D}${sysconfdir}/clamd.conf - - # Save the installed freshclam.conf in the doc dir and then install our new one - install -m 0755 ${D}${sysconfdir}/freshclam.conf ${D}${docdir}/clamav/freshclam.conf.example - - # Install our config files and init scripts - install -m 0755 ${WORKDIR}/freshclam.conf ${D}${sysconfdir}/freshclam.conf - install -m 0755 ${WORKDIR}/clamav-daemon.default ${D}${sysconfdir}/default/clamav-daemon - install -m 0755 ${WORKDIR}/clamav-daemon.init ${D}${sysconfdir}/init.d/clamav-daemon - install -m 0755 ${WORKDIR}/clamav-freshclam.init ${D}${sysconfdir}/init.d/clamav-freshclam +require clamav.inc - # We need some /var directories - for i in 02_clamav-data 03_clamav-daemon 03_clamav-freshclam; do - install -m 0644 ${WORKDIR}/volatiles.$i ${D}${sysconfdir}/default/volatiles/$i - done - - # Move the clamav data to a non-volatile location, we'll symlink back - # If freshclam is running it'll break the link to this static data - # once it has succesfully downloaded an update - install -m 0755 -d ${D}${libdir} - mv ${D}${localstatedir}/lib/clamav ${D}${libdir} -} -do_stage () { - oe_libinstall -a -so libclamav ${STAGING_LIBDIR} - rm -f ${STAGING_LIBDIR}/libclamav.la - install -m 0644 libclamav/clamav.h ${STAGING_INCDIR} -} - -PACKAGES += "${PN}-freshclam ${PN}-daemon ${PN}-data ${PN}-lib" - -FILES_${PN} = "${bindir}/clamscan ${bindir}/sigtool ${bindir}/clamdscan" -FILES_${PN}-lib = "${libdir}/libclamav.so.*" -FILES_${PN}-freshclam = "${bindir}/freshclam \ - ${sysconfdir}/freshclam.conf \ - ${sysconfdir}/init.d/clamav-freshclam \ - ${sysconfdir}/default/volatiles/03_clamav-freshclam" -FILES_${PN}-daemon = "${sysconfdir}/clamd.conf \ - ${sbindir}/clamd \ - ${sysconfdir}/init.d/clamav-daemon \ - ${sysconfdir}/default/clamav-daemon \ - ${sysconfdir}/default/volatiles/03_clamav-daemon" -FILES_${PN}-data = "${libdir}/clamav/main.cvd \ - ${libdir}/clamav/daily.cvd \ - ${sysconfdir}/default/volatiles/02_clamav-data" -FILES_${PN}-dev += "${bindir}/clamav-config" - -# Add clamav's user and groups -pkg_postinst_${PN}-freshclam () { - grep -q clamav: /etc/group || addgroup clamav - grep -q clamav: /etc/passwd || \ - adduser --disabled-password --home=/var/lib/clamav/ --system \ - --ingroup clamav --no-create-home -g "ClamAV" clamav - /etc/init.d/populate-volatile.sh -} -pkg_postinst_${PN}-daemon () { - grep -q clamav: /etc/group || addgroup clamav - grep -q clamav: /etc/passwd || \ - adduser --disabled-password --home=/var/lib/clamav/ --system \ - --ingroup clamav --no-create-home -g "ClamAV" clamav - /etc/init.d/populate-volatile.sh -} -pkg_postinst_${PN}-data () { - grep -q clamav: /etc/group || addgroup clamav - grep -q clamav: /etc/passwd || \ - adduser --disabled-password --home=/var/lib/clamav/ --system \ - --ingroup clamav --no-create-home -g "ClamAV" clamav - /etc/init.d/populate-volatile.sh -} - -# Indicate that the default files are configuration files -CONFFILES_${PN}-daemon = "${sysconfdir}/clamd.conf \ - ${sysconfdir}/default/clamav-daemon" -CONFFILES_${PN}-freshclam = "${sysconfdir}/freshclam.conf" - -INITSCRIPT_PACKAGES = "${PN}-daemon ${PN}-freshclam" -INITSCRIPT_NAME_${PN}-daemon = "clamav-daemon" -INITSCRIPT_NAME_${PN}-freshclam = "clamav-freshclam" -INITSCRIPT_PARAMS_${PN}-daemon = "defaults 50 50" -INITSCRIPT_PARAMS_${PN}-freshclam = "defaults 50 50" +PR = "r6" diff --git a/packages/clamav/clamav_0.88.5.bb b/packages/clamav/clamav_0.88.5.bb new file mode 100644 index 0000000000..fec4ae59d8 --- /dev/null +++ b/packages/clamav/clamav_0.88.5.bb @@ -0,0 +1,3 @@ +require clamav.inc + +PR = "r0" diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 162274b89f..fc527b292a 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -261,7 +261,7 @@ python package_do_split_gconvs () { cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts) bb.note("generating locale %s (%s)" % (locale, encoding)) if os.system(cmd): - raise bb.build.FuncFailed("localedef returned an error.") + raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd) def output_locale(name, locale, encoding): use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) diff --git a/packages/clamav/site/.mtn2git_empty b/packages/gpe-scap/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/clamav/site/.mtn2git_empty +++ b/packages/gpe-scap/.mtn2git_empty diff --git a/packages/gpe-screenshot/gpe-screenshot_0.4.bb b/packages/gpe-scap/gpe-scap_1.0.bb index ce31febc3d..6f0c7746ef 100644 --- a/packages/gpe-screenshot/gpe-screenshot_0.4.bb +++ b/packages/gpe-scap/gpe-scap_1.0.bb @@ -2,10 +2,13 @@ DESCRIPTION = "GPE screenshot application" LICENSE = "GPL" PRIORITY = "optional" SECTION = "gpe" -PR = "r1" +PR = "r0" + +RREPLACES = "gpe-screenshot" DEPENDS = "glib-2.0 gtk+ libglade" +GPE_TARBALL_SUFFIX = "bz2" + inherit gpe autotools -SRC_URI += "file://fix-segfault.patch;patch=1;pnum=0 " diff --git a/packages/gpe-screenshot/files/fix-segfault.patch b/packages/gpe-screenshot/files/fix-segfault.patch deleted file mode 100644 index dc185a9b51..0000000000 --- a/packages/gpe-screenshot/files/fix-segfault.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: src/gpe-screenshot.c -=================================================================== -RCS file: /cvs/gpe/base/gpe-screenshot/src/gpe-screenshot.c,v -retrieving revision 1.1 -retrieving revision 1.2 -diff -u -r1.1 -r1.2 ---- src/gpe-screenshot.c 1 Nov 2005 20:54:38 -0000 1.1 -+++ src/gpe-screenshot.c 10 Aug 2006 15:07:21 -0000 1.2 -@@ -334,10 +334,9 @@ - { - GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_BUTTON); - -- g_object_set (mainDlg->ok_button, "use-stock", FALSE); -- g_object_set (mainDlg->ok_button, "use-underline", TRUE); -- g_object_set (mainDlg->ok_button, "label", "_Upload"); -- g_object_set (mainDlg->ok_button, "image", GTK_WIDGET (icon)); -+ gtk_button_set_use_stock (mainDlg->ok_button, FALSE); -+ gtk_button_set_label (mainDlg->ok_button, "_Upload"); -+ gtk_button_set_image (mainDlg->ok_button, icon); - - gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->entry), FALSE); - gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->browse_button), FALSE); -@@ -347,10 +346,9 @@ - GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_SAVE, GTK_ICON_SIZE_BUTTON); - - /* for some odd reason use-stock doesn't have any effect. set the image manually...*/ -- g_object_set (mainDlg->ok_button, "use-stock", TRUE); -- g_object_set (mainDlg->ok_button, "use-underline", TRUE); -- g_object_set (mainDlg->ok_button, "label", GTK_STOCK_SAVE); -- g_object_set (mainDlg->ok_button, "image", GTK_WIDGET (icon)); -+ gtk_button_set_label (mainDlg->ok_button, GTK_STOCK_SAVE); -+ gtk_button_set_use_stock (mainDlg->ok_button, TRUE); -+ gtk_button_set_image (mainDlg->ok_button, icon); - - gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->entry), TRUE); - gtk_widget_set_sensitive (GTK_WIDGET (mainDlg->browse_button), TRUE); diff --git a/packages/gtk+/gtk+_2.10.0.bb b/packages/gtk+/gtk+_2.10.0.bb index ef1f4f1d60..1f8087cd64 100644 --- a/packages/gtk+/gtk+_2.10.0.bb +++ b/packages/gtk+/gtk+_2.10.0.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups" -PR = "r3" +PR = "r4" # disable per default - untested and not all patches included. DEFAULT_PREFERENCE = "-1" @@ -37,9 +37,9 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" -RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" +RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" diff --git a/packages/gtk+/gtk+_2.10.1.bb b/packages/gtk+/gtk+_2.10.1.bb index f4441e598c..462c0d725e 100644 --- a/packages/gtk+/gtk+_2.10.1.bb +++ b/packages/gtk+/gtk+_2.10.1.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups" -PR = "r0" +PR = "r1" # disable per default - untested and not all patches included. DEFAULT_PREFERENCE = "-1" @@ -37,9 +37,9 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" -RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" +RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" diff --git a/packages/gtk+/gtk+_2.10.3.bb b/packages/gtk+/gtk+_2.10.3.bb index f4441e598c..462c0d725e 100644 --- a/packages/gtk+/gtk+_2.10.3.bb +++ b/packages/gtk+/gtk+_2.10.3.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups" -PR = "r0" +PR = "r1" # disable per default - untested and not all patches included. DEFAULT_PREFERENCE = "-1" @@ -37,9 +37,9 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" -RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" +RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" diff --git a/packages/gtk+/gtk+_2.4.13.bb b/packages/gtk+/gtk+_2.4.13.bb index 9fdef71c1f..83f6be1982 100644 --- a/packages/gtk+/gtk+_2.4.13.bb +++ b/packages/gtk+/gtk+_2.4.13.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor" -PR = "r6" +PR = "r7" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-${PV}.tar.bz2 \ file://no-demos.patch;patch=1 \ @@ -36,7 +36,7 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${datadir}/themes ${sysconfdir}" FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" +RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" EXTRA_OECONF = "--without-libtiff --disable-xkb" # --disable-cruft diff --git a/packages/gtk+/gtk+_2.4.4.bb b/packages/gtk+/gtk+_2.4.4.bb index 1d33101b3f..7849e91b92 100644 --- a/packages/gtk+/gtk+_2.4.4.bb +++ b/packages/gtk+/gtk+_2.4.4.bb @@ -5,7 +5,8 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor" -PR = "r7" +RRECOMMENDS = "ttf-dejavu-sans" +PR = "r8" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-${PV}.tar.bz2 \ file://no-demos.patch;patch=1 \ diff --git a/packages/gtk+/gtk+_2.6.10.bb b/packages/gtk+/gtk+_2.6.10.bb index b8b65d3351..583dd6466e 100644 --- a/packages/gtk+/gtk+_2.6.10.bb +++ b/packages/gtk+/gtk+_2.6.10.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://help.patch;patch=1 \ @@ -33,7 +33,7 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" +RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" # --disable-cruft diff --git a/packages/gtk+/gtk+_2.6.3.bb b/packages/gtk+/gtk+_2.6.3.bb index 4643eb557d..2805724e09 100644 --- a/packages/gtk+/gtk+_2.6.3.bb +++ b/packages/gtk+/gtk+_2.6.3.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://no-demos.patch;patch=1 \ @@ -32,7 +32,7 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" +RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" # --disable-cruft diff --git a/packages/gtk+/gtk+_2.6.4-1.osso7.bb b/packages/gtk+/gtk+_2.6.4-1.osso7.bb index 6a6d560a50..9a625d4686 100644 --- a/packages/gtk+/gtk+_2.6.4-1.osso7.bb +++ b/packages/gtk+/gtk+_2.6.4-1.osso7.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt" -PR = "r1" +PR = "r2" S = "${WORKDIR}/gtk+2.0-2.6.4/upstream/tarballs/gtk+-2.6.4/" @@ -124,7 +124,7 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" +RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" # --disable-cruft diff --git a/packages/gtk+/gtk+_2.6.7.bb b/packages/gtk+/gtk+_2.6.7.bb index 4f43fdfecf..264e2c6cca 100644 --- a/packages/gtk+/gtk+_2.6.7.bb +++ b/packages/gtk+/gtk+_2.6.7.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://no-demos.patch;patch=1 \ @@ -32,7 +32,7 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" +RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" # --disable-cruft diff --git a/packages/gtk+/gtk+_2.8.16.bb b/packages/gtk+/gtk+_2.8.16.bb index e4ac0617a0..5c21b8f587 100644 --- a/packages/gtk+/gtk+_2.8.16.bb +++ b/packages/gtk+/gtk+_2.8.16.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo" -PR = "r2" +PR = "r3" DEFAULT_PREFERENCE = "-1" @@ -28,6 +28,8 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \ inherit autotools pkgconfig +CFLAGS += " -lz " + FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${bindir}/gtk-query-immodules-2.0 \ ${bindir}/gtk-update-icon-cache \ @@ -36,7 +38,7 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" +RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" # --disable-cruft diff --git a/packages/gtk+/gtk+_2.8.9.bb b/packages/gtk+/gtk+_2.8.9.bb index d2c3cd52e7..f1e9208e40 100644 --- a/packages/gtk+/gtk+_2.8.9.bb +++ b/packages/gtk+/gtk+_2.8.9.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo" -PR = "r4" +PR = "r5" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \ file://no-xwc.patch;patch=1 \ @@ -34,9 +34,9 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" -RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" +RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" # --disable-cruft diff --git a/packages/keymaps/files/tosa/keymap-2.6.map b/packages/keymaps/files/tosa/keymap-2.6.map index 8a812754f7..b85d5616e5 100644 --- a/packages/keymaps/files/tosa/keymap-2.6.map +++ b/packages/keymaps/files/tosa/keymap-2.6.map @@ -63,7 +63,6 @@ keycode 41 = keycode 42 = Shift keycode 43 = keycode 44 = z - altgr keycode 44 = bar keycode 45 = x keycode 46 = c keycode 47 = v @@ -89,11 +88,12 @@ keycode 55 = keycode 56 = Alt keycode 57 = space space control keycode 57 = nul + altgr keycode 57 = bar keycode 59 = F9 keycode 60 = F10 keycode 61 = AltGr keycode 62 = Escape -keycode 63 = Return +keycode 63 = space keycode 64 = Control keycode 65 = F15 keycode 66 = F24 diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb index 9bd2a6583a..2766fad2f4 100644 --- a/packages/keymaps/keymaps_1.0.bb +++ b/packages/keymaps/keymaps_1.0.bb @@ -3,7 +3,7 @@ SECTION = "base" RDEPENDS = "initscripts console-tools" LICENSE = "GPL" PACKAGE_ARCH = "${MACHINE}" -PR = "r10" +PR = "r11" inherit update-rc.d diff --git a/packages/libpng/1.2.12/.mtn2git_empty b/packages/libpng/1.2.12/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/libpng/1.2.12/.mtn2git_empty +++ /dev/null diff --git a/packages/libpng/libpng-1.2.12/.mtn2git_empty b/packages/libpng/libpng-1.2.12/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/libpng/libpng-1.2.12/.mtn2git_empty +++ /dev/null diff --git a/packages/fltk/fltk-1.2+cvs20040806/.mtn2git_empty b/packages/linux/linux-navman/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/fltk/fltk-1.2+cvs20040806/.mtn2git_empty +++ b/packages/linux/linux-navman/.mtn2git_empty diff --git a/packages/linux/linux-navman/defconfig b/packages/linux/linux-navman/defconfig new file mode 100644 index 0000000000..ddcf1f4eeb --- /dev/null +++ b/packages/linux/linux-navman/defconfig @@ -0,0 +1,733 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.18 +# Mon Oct 2 23:23:58 2006 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +# CONFIG_MODULE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_KMOD is not set + +# +# Block layer +# +# CONFIG_BLK_DEV_IO_TRACE is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_PNX4008 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set + +# +# Intel PXA2xx Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_LOGICPD_PXA270 is not set +# CONFIG_MACH_MAINSTONE is not set +CONFIG_ARCH_PXA_IDP=y +# CONFIG_PXA_SHARPSL is not set +# CONFIG_MACH_TRIZEPS4 is not set +CONFIG_PXA25x=y + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y + +# +# Processor Features +# +# CONFIG_ARM_THUMB is not set +CONFIG_XSCALE_PMU=y + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +# CONFIG_NO_IDLE_HZ is not set +CONFIG_HZ=100 +# CONFIG_AEABI is not set +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="root=/dev/mmcblk0p2 ro mem=32M" +# CONFIG_XIP_KERNEL is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set +# CONFIG_ARTHUR is not set + +# +# Power management options +# +# CONFIG_PM is not set +# CONFIG_APM is not set + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +# CONFIG_PACKET is not set +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +# CONFIG_INET is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +# CONFIG_MTD is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_BLK_DEV_INITRD is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +# CONFIG_NETDEVICES is not set +# CONFIG_DUMMY is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# PHY device support +# + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +# CONFIG_INPUT_EVDEV is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +CONFIG_KEYBOARD_ICN330=m +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +# CONFIG_SERIO_SERPORT is not set +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_NVRAM is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set + +# +# I2C support +# +# CONFIG_I2C is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# + +# +# Hardware Monitoring support +# +# CONFIG_HWMON is not set +# CONFIG_HWMON_VID is not set + +# +# Misc devices +# + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_V4L2=y + +# +# Digital Video Broadcasting Devices +# + +# +# Graphics support +# +# CONFIG_FIRMWARE_EDID is not set +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_PXA=y +# CONFIG_FB_PXA_PARAMETERS is not set +# CONFIG_FB_MBX is not set +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set + +# +# Logo configuration +# +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +# CONFIG_USB_ARCH_HAS_OHCI is not set +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=y +CONFIG_MMC_PXA=y + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +# CONFIG_INOTIFY_USER is not set +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +# CONFIG_VFAT_FS is not set +CONFIG_FAT_DEFAULT_CODEPAGE=437 +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +# CONFIG_NLS_CODEPAGE_437 is not set +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_FS is not set +CONFIG_FRAME_POINTER=y +# CONFIG_UNWIND_INFO is not set +# CONFIG_DEBUG_USER is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +# CONFIG_CRYPTO is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_PLIST=y diff --git a/packages/linux/linux-navman_2.6.18.bb b/packages/linux/linux-navman_2.6.18.bb new file mode 100644 index 0000000000..29d8944a3b --- /dev/null +++ b/packages/linux/linux-navman_2.6.18.bb @@ -0,0 +1,54 @@ +DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines" +SECTION = "kernel" +LICENSE = "GPL" + +#DEPENDS = "u-boot" + +PR = "r0" + +COMPATIBLE_MACHINE = "navman-icn330" + +SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ + http://www.duff.dk/navman/navman-2.6.18.patch;patch=1 \ + file://defconfig \ + " + +S = "${WORKDIR}/linux-2.6.18" + +inherit kernel + +KERNEL_IMAGETYPE = "zImage" + +do_configure() { + rm -f ${S}/.config + + if [ ! -e ${WORKDIR}/defconfig ]; then + die "No default configuration for ${MACHINE} available." + fi + + + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + echo "CONFIG_AEABI=y" >> ${S}/.config + echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config + else + echo "# CONFIG_AEABI is not set" >> ${S}/.config + echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config + fi + + sed -e '/CONFIG_AEABI/d' \ + -e '/CONFIG_OABI_COMPAT=/d' \ + '${WORKDIR}/defconfig' >>'${S}/.config' + + yes '' | oe_runmake oldconfig +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile + + diff --git a/packages/oprofile/oprofile/opcontrol_bashisms.patch b/packages/oprofile/oprofile/opcontrol_bashisms.patch new file mode 100644 index 0000000000..01ef11df86 --- /dev/null +++ b/packages/oprofile/oprofile/opcontrol_bashisms.patch @@ -0,0 +1,16 @@ + utils/opcontrol | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: oprofile-0.9.2/utils/opcontrol +=================================================================== +--- oprofile-0.9.2.orig/utils/opcontrol 2006-03-29 22:54:07.000000000 +0100 ++++ oprofile-0.9.2/utils/opcontrol 2006-10-12 11:14:39.000000000 +0100 +@@ -485,7 +485,7 @@ validate_separate_args() + SEPARATE_KERNEL=0 + SEPARATE_THREAD=0 + SEPARATE_CPU=0 +- while (($i < $#)); do ++ while [ "$i" -lt "$#" ]; do + shift + case "$1" in + lib|library) diff --git a/packages/oprofile/oprofile_0.9.1.bb b/packages/oprofile/oprofile_0.9.2.bb index 991c7bfc99..e64aa10d49 100644 --- a/packages/oprofile/oprofile_0.9.1.bb +++ b/packages/oprofile/oprofile_0.9.2.bb @@ -6,6 +6,7 @@ DEPENDS = "popt binutils" SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \ file://no_arm_mapping_syms.patch;patch=1 \ + file://opcontrol_bashisms.patch;patch=1 \ file://acinclude.m4" S = "${WORKDIR}/oprofile-${PV}" diff --git a/packages/oprofile/oprofile_cvs.bb b/packages/oprofile/oprofile_cvs.bb index 5818d2ae5c..902c569e85 100644 --- a/packages/oprofile/oprofile_cvs.bb +++ b/packages/oprofile/oprofile_cvs.bb @@ -1,12 +1,16 @@ -PV = "0.9.1+cvs${SRCDATE}" +PV = "0.9.2+cvs${SRCDATE}" +PR = "r1" SECTION = "devel" DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \ of profiling all running code at low overhead." LICENSE = "GPL" DEPENDS = "popt binutils" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \ +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "cvs://anonymous@oprofile.cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \ file://no_arm_mapping_syms.patch;patch=1 \ + file://opcontrol_bashisms.patch;patch=1 \ file://acinclude.m4" S = "${WORKDIR}/oprofile" diff --git a/packages/pine/pine_4.63.bb b/packages/pine/pine_4.64.bb index 1bcb451f52..1bcb451f52 100644 --- a/packages/pine/pine_4.63.bb +++ b/packages/pine/pine_4.64.bb diff --git a/packages/quagga/quagga-0.99.2/.mtn2git_empty b/packages/quagga/quagga-0.99.2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/quagga/quagga-0.99.2/.mtn2git_empty +++ /dev/null diff --git a/packages/gpe-screenshot/.mtn2git_empty b/packages/stage-manager/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gpe-screenshot/.mtn2git_empty +++ b/packages/stage-manager/.mtn2git_empty diff --git a/packages/gpe-screenshot/files/.mtn2git_empty b/packages/stage-manager/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gpe-screenshot/files/.mtn2git_empty +++ b/packages/stage-manager/files/.mtn2git_empty diff --git a/packages/stage-manager/files/stage-manager b/packages/stage-manager/files/stage-manager new file mode 100755 index 0000000000..c5b6d17a56 --- /dev/null +++ b/packages/stage-manager/files/stage-manager @@ -0,0 +1,120 @@ +#!/usr/bin/env python + +# Copyright (C) 2006 Richard Purdie +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by the Free +# Software Foundation; +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +import optparse +import os, sys, stat + +__version__ = "0.0.1" + + +def write_cache(cachefile, cachedata): + fd = open(cachefile, 'w') + for f in cachedata: + s = f + '|' + str(cachedata[f]['ts']) + '|' + str(cachedata[f]['size']) + fd.write(s + '\n') + fd.close() + +def read_cache(cachefile): + cache = {} + f = open(cachefile, 'r') + lines = f.readlines() + f.close() + for l in lines: + data = l.split('|') + cache[data[0]] = {} + cache[data[0]]['ts'] = int(data[1]) + cache[data[0]]['size'] = int(data[2]) + return cache + +def mkdirhier(dir): + """Create a directory like 'mkdir -p', but does not complain if + directory already exists like os.makedirs + """ + try: + os.makedirs(dir) + except OSError, e: + if e.errno != 17: raise e + +if __name__ == "__main__": + parser = optparse.OptionParser( version = "Metadata Stage Manager version %s" % ( __version__ ), + usage = """%prog [options]\n\nPerforms mamagement tasks on a metadata staging area.""" ) + + parser.add_option( "-p", "--parentdir", help = "the path to the metadata parent directory", + action = "store", dest = "parentdir", default = None) + + parser.add_option( "-c", "--cachefile", help = "the cache file to use", + action = "store", dest = "cachefile", default = None) + + parser.add_option( "-d", "--copydir", help = "copy changed files to this directory", + action = "store", dest = "copydir", default = None) + + parser.add_option( "-u", "--update", help = "update the cache file", + action = "store_true", dest = "update", default = False) + + (options, args) = parser.parse_args() + + if options.parentdir is None: + print("Error, --parentdir option not supplied") + sys.exit(1) + + if options.cachefile is None: + print("Error, --cachefile option not supplied") + sys.exit(1) + + if not options.parentdir.endswith('/'): + options.parentdir = options.parentdir + '/' + + cache = {} + if os.access(options.cachefile, os.F_OK): + cache = read_cache(options.cachefile) + + found = False + + for root, dirs, files in os.walk(options.parentdir): + for f in files: + path = os.path.join(root, f) + if not os.access(path, os.R_OK): + continue + fstamp = os.stat(path) + if path not in cache: + print "new file %s" % path + cache[path] = {} + cache[path]['ts'] = fstamp[stat.ST_MTIME] + cache[path]['size'] = fstamp[stat.ST_SIZE] + if options.copydir: + copypath = os.path.join(options.copydir, path.replace(options.parentdir, '', 1)) + mkdirhier(os.path.split(copypath)[0]) + os.system("mv " + path + " " + copypath) + found = True + else: + if cache[path]['ts'] != fstamp[stat.ST_MTIME] or cache[path]['size'] != fstamp[stat.ST_SIZE]: + print "file %s changed" % path + cache[path] = {} + cache[path]['ts'] = fstamp[stat.ST_MTIME] + cache[path]['size'] = fstamp[stat.ST_SIZE] + if options.copydir: + copypath = os.path.join(options.copydir, path.replace(options.parentdir, '', 1)) + mkdirhier(os.path.split(copypath)[0]) + os.system("mv " + path + " " + copypath) + found = True + + if options.update: + print "Updating" + mkdirhier(os.path.split(options.cachefile)[0]) + write_cache(options.cachefile, cache) + + if found: + sys.exit(5) + sys.exit(0) + + + diff --git a/packages/stage-manager/stagemanager-native_0.0.1.bb b/packages/stage-manager/stagemanager-native_0.0.1.bb new file mode 100644 index 0000000000..db8299505a --- /dev/null +++ b/packages/stage-manager/stagemanager-native_0.0.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Helper script for packaged-staging.bbclass" + +SRC_URI = "file://stage-manager" +LICENSE = "GPLv2" + +PACKAGE_ARCH = "all" + +inherit native + +INHIBIT_DEFAULT_DEPS = "1" + +do_install() { + install -d ${STAGING_BINDIR} + install -m 0755 ${WORKDIR}/stage-manager ${STAGING_BINDIR} +} + + diff --git a/packages/tasks/task-gpe.bb b/packages/tasks/task-gpe.bb index 80f85238d1..31b00c1680 100644 --- a/packages/tasks/task-gpe.bb +++ b/packages/tasks/task-gpe.bb @@ -88,7 +88,7 @@ RDEPENDS_gpe-task-apps := "\ gpe-aerial \ gpe-soundbite \ rosetta \ - gpe-screenshot \ + gpe-scap \ gpe-windowlist" RDEPENDS_gpe-task-games := "\ diff --git a/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb b/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb index 3fb7ee55ea..cec4c0eca2 100644 --- a/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb +++ b/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb @@ -4,21 +4,24 @@ SECTION = "bootloader" PRIORITY = "optional" LICENSE = "GPL" -PR = "r0" +PR = "r1" TAG = "${@bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git;tag=${TAG}" # file://config.patch;patch=1" +SRC_URI_append_navman-icn330 = " http://www.duff.dk/navman/navman-u-boot-2006-30-2020.patch;patch=1" + S = "${WORKDIR}/git" #EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CFLAGS="" CPPFLAGS="" LDFLAGS=""" -EXTRA_OEMAKE = "" +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" UBOOT_MACHINE ?= "${MACHINE}_config" UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin" +PACKAGE_ARCH = "${MACHINE_ARCH}" #inherit base diff --git a/packages/xoo/xoo_svn.bb b/packages/xoo/xoo_svn.bb index dedab26b21..992d918316 100644 --- a/packages/xoo/xoo_svn.bb +++ b/packages/xoo/xoo_svn.bb @@ -3,9 +3,9 @@ It is intended for embedded developers that want to simulate a target device \ (with an accurate display size, working hardware buttons, etc) on a desktop machine." HOMEPAGE = "http://projects.o-hand.com/xoo" LICENSE = "GPL" -DEPENDS = "virtual/libx11 libxtst" +DEPENDS = "virtual/libx11 libxtst gtk+ libglade" PV = "0.7+svn${SRCDATE}" -PR = "r0" +PR = "r1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=Xoo;proto=http" S = "${WORKDIR}/Xoo" |