diff options
19 files changed, 326 insertions, 18 deletions
diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc index c8efbdfec7..d495930b20 100644 --- a/conf/distro/include/preferred-slugos-versions.inc +++ b/conf/distro/include/preferred-slugos-versions.inc @@ -32,7 +32,6 @@ SRCREV_pn-opkg-sdk = "160" ### may include preferred versions for toolchain components. PREFERRED_VERSION_automake-native ?= "1.10" -PREFERRED_VERSION_avahi ?= "0.6.23" PREFERRED_VERSION_binutils ?= "2.18.50.0.7" PREFERRED_VERSION_binutils-cross ?= "2.18.50.0.7" PREFERRED_VERSION_binutils-cross-sdk ?= "2.18.50.0.7" @@ -60,11 +59,18 @@ PREFERRED_VERSION_netatalk ?= "2.0.3" PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63" PREFERRED_VERSION_pkgconfig ?= "0.23" PREFERRED_VERSION_pkgconfig-native ?= "0.23" -PREFERRED_VERSION_tiff ?= "3.7.2" PREFERRED_VERSION_udev ?= "118" ##################### Stuff with special notes, and broken stuff: +# libtool/pkgconfig victims -- these packages are locked down because +# newer versions also require newer libtool/pkgconfig versions. + +PREFERRED_VERSION_avahi ?= "0.6.23" +PREFERRED_VERSION_gst-plugins-base ?= "0.10.17" +PREFERRED_VERSION_tiff ?= "3.7.2" + + # Hack alert - selecting this version of libusb effectively selects # the use of libusb1 and libusb-compat in the case that something # still depends on libusb. This is required because otherwise diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc index 64ef21cbd4..047b33a71c 100644 --- a/packages/dbus/dbus.inc +++ b/packages/dbus/dbus.inc @@ -79,8 +79,10 @@ fi MESSAGEUSER=messagebus MESSAGEHOME=/var/run/dbus mkdir -p $MESSAGEHOME || true -chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER" -chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER" +grep -q ^$MESSAGEUSER: /etc/group || addgroup "$MESSAGEUSER" +chgrp "$MESSAGEUSER" "$MESSAGEHOME" +grep -q ^$MESSAGEUSER: /etc/passwd || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER" +chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" grep -q netdev: /etc/group || addgroup netdev chmod u+s /usr/libexec/dbus-daemon-launch-helper } diff --git a/packages/dbus/dbus_1.0.3.bb b/packages/dbus/dbus_1.0.3.bb index 6f71d062ce..2589cfef53 100644 --- a/packages/dbus/dbus_1.0.3.bb +++ b/packages/dbus/dbus_1.0.3.bb @@ -1,4 +1,4 @@ require dbus.inc -PR = "r15" +PR = "r16" DEFAULT_PREFERENCE = "-1" diff --git a/packages/dbus/dbus_1.2.1.bb b/packages/dbus/dbus_1.2.1.bb index e14523daaf..2a663f4bfa 100644 --- a/packages/dbus/dbus_1.2.1.bb +++ b/packages/dbus/dbus_1.2.1.bb @@ -1,3 +1,3 @@ include dbus.inc -PR = "r9" +PR = "r10" diff --git a/packages/dsplink/dsplink.inc b/packages/dsplink/dsplink.inc index 09c8759768..1ca01c399c 100644 --- a/packages/dsplink/dsplink.inc +++ b/packages/dsplink/dsplink.inc @@ -103,7 +103,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" #legacy upgrade helpers RPROVIDES_ti-dsplink-module += "dsplink-module" +RREPLACES_ti-dsplink-module += "dsplink-module" RPROVIDES_ti-dsplink-apps += "dsplink-apps" +RREPLACES_ti_dsplink-apps += "dsplink-apps" #add run-time dependencies - note for kernel module we can only use RRECOMMENDS, since modules might be built into the kernel RRECOMMENDS_ti-dsplink-apps += "ti-dsplink-module" diff --git a/packages/dsplink/files/Makefile-dsplink-gpp b/packages/dsplink/files/Makefile-dsplink-gpp index e69ce75f19..d9f2f6209a 100755 --- a/packages/dsplink/files/Makefile-dsplink-gpp +++ b/packages/dsplink/files/Makefile-dsplink-gpp @@ -29,7 +29,7 @@ SOURCES := include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)pmgr$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP)$(TI_DSPLINK_GPPOSVERSION)$(DIRSEP)SOURCES PMGR_SOURCES += $(addprefix $(TI_DSPLINK_RELATIVE_PATH)gpp$(DIRSEP)src$(DIRSEP)pmgr$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP)$(TI_DSPLINK_GPPOSVERSION)$(DIRSEP),$(SOURCES)) SOURCES := -include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)osal$(DIRSEP)$(DIRSEP)SOURCES +include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)osal$(DIRSEP)SOURCES OSAL_SOURCES := $(addprefix $(TI_DSPLINK_RELATIVE_PATH)gpp$(DIRSEP)src$(DIRSEP)osal$(DIRSEP)$(DIRSEP),$(SOURCES)) SOURCES := include $(TI_DSPLINK_GPPROOT)$(DIRSEP)src$(DIRSEP)osal$(DIRSEP)$(TI_DSPLINK_GPPOS)$(DIRSEP)SOURCES diff --git a/packages/dsplink/files/loadmodules-ti-codec-engine-apps.sh b/packages/dsplink/files/loadmodules-ti-codec-engine-apps.sh new file mode 100755 index 0000000000..743a07ebba --- /dev/null +++ b/packages/dsplink/files/loadmodules-ti-codec-engine-apps.sh @@ -0,0 +1,37 @@ +# +# Default Memory Map - for OMAP3530 CE 2.21 examples +# +# Start Addr Size Description +# ------------------------------------------- +# 0x80000000 80 MB Linux +# 0x85000000 08 MB CMEM +# 0x86000000 24 MB DDRALGHEAP +# 0x87800000 6 MB DDR2 (BIOS, Codecs, Applications) +# 0x87E00000 1 MB DSPLINK (MEM) +# 0x87F00000 4 KB DSPLINK (RESET) +# 0x87F01000 1020 KB unused + +# sanity check to verify that we're using the right mem=xxM (80M in this case) +awk '/MemTotal:/ { + mem=$2 + + if (mem > 80 * 1024) + print "Warning! You need to use mem=80M or less on the kernel cmdline" + + printf "You have %dkB total memory for Linux\n", mem +}' /proc/meminfo + +# Select cmemk parameters for best fit, i.e. starting at 0x85000000 +modprobe cmemk phys_start=0x85000000 phys_end=0x86000000 pools=20x4096,8x131072,5x1048576,1x1429440,1x256000,1x3600000,5x829440 + +# insert DSP/BIOS Link driver +# +modprobe dsplinkk + +# make /dev/dsplink +rm -f /dev/dsplink +mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0 + +# insert Local Power Manager driver +# +modprobe lpm_omap3530 diff --git a/packages/dsplink/files/loadmodules-ti-dmai-apps.sh b/packages/dsplink/files/loadmodules-ti-dmai-apps.sh new file mode 100755 index 0000000000..af4cef9f3f --- /dev/null +++ b/packages/dsplink/files/loadmodules-ti-dmai-apps.sh @@ -0,0 +1,37 @@ +# +# Default Memory Map - for OMAP3530 dvsdk examples from 3.00.00.29 - this memory map is used for DMAI apps +# +# Start Addr Size Description +# ------------------------------------------- +# 0x80000000 88 MB Linux +# 0x85800000 08 MB CMEM +# 0x86800000 16 MB DDRALGHEAP +# 0x87800000 6 MB DDR2 (BIOS, Codecs, Applications) +# 0x87E00000 1 MB DSPLINK (MEM) +# 0x87F00000 4 KB DSPLINK (RESET) +# 0x87F01000 1020 KB unused + +# sanity check to verify that we're using the right mem=xxM (88M in this case) +awk '/MemTotal:/ { + mem=$2 + + if (mem > 88 * 1024) + print "Warning! You need to use mem=88M or less on the kernel cmdline" + + printf "You have %dkB total memory for Linux\n", mem +}' /proc/meminfo + +# Select cmemk parameters for best fit, i.e. starting at 0x85000000 +modprobe cmemk phys_start=0x85800000 phys_end=0x86800000 pools=20x4096,8x131072,5x1048576,1x1429440,1x256000,1x3600000,5x829440 + +# insert DSP/BIOS Link driver +# +modprobe dsplinkk + +# make /dev/dsplink +rm -f /dev/dsplink +mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0 + +# insert Local Power Manager driver +# +modprobe lpm_omap3530 diff --git a/packages/dsplink/files/loadmodules-ti-dsplink-apps.sh b/packages/dsplink/files/loadmodules-ti-dsplink-apps.sh new file mode 100755 index 0000000000..c93b637867 --- /dev/null +++ b/packages/dsplink/files/loadmodules-ti-dsplink-apps.sh @@ -0,0 +1,25 @@ +# +# Default Memory Map - for OMAP3530 dsplink examples +# +# Start Addr Size Description +# ------------------------------------------- +# 0x80000000 126 MB Linux +# 0x87E00000 2 MB DSPLINK (MEM) + DDR + DSPLINK (RESET) + +# sanity check to verify that we're using the right mem=xxM (126M in this case) +awk '/MemTotal:/ { + mem=$2 + + if (mem > 126 * 1024) + print "Warning! You need to use mem=126M or less on the kernel cmdline" + + printf "You have %dkB total memory for Linux\n", mem +}' /proc/meminfo + +# insert DSP/BIOS Link driver +# +modprobe dsplinkk + +# make /dev/dsplink +rm -f /dev/dsplink +mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0 diff --git a/packages/dsplink/files/sdma-class-device-and-includes-fix.patch b/packages/dsplink/files/sdma-class-device-and-includes-fix.patch new file mode 100644 index 0000000000..2dcc7a3b7e --- /dev/null +++ b/packages/dsplink/files/sdma-class-device-and-includes-fix.patch @@ -0,0 +1,59 @@ +diff -uNr codec_engine_2_21/cetools/packages/ti/sdo/linuxutils/sdma/src/module/sdmak.c codec_engine_2_21_fix/cetools/packages/ti/sdo/linuxutils/sdma/src/module/sdmak.c +--- codec_engine_2_21/cetools/packages/ti/sdo/linuxutils/sdma/src/module/sdmak.c 2009-02-20 14:49:41.000000000 +0000 ++++ codec_engine_2_21_fix/cetools/packages/ti/sdo/linuxutils/sdma/src/module/sdmak.c 2009-02-20 15:07:59.000000000 +0000 +@@ -17,6 +17,7 @@ + /* + * sdmak.c + */ ++#include <linux/version.h> + #include <linux/kernel.h> + #include <linux/sched.h> + #include <linux/module.h> +@@ -32,14 +33,20 @@ + #include <linux/irq.h> + #include <linux/highmem.h> + #include <linux/pagemap.h> +- +-#include <asm/arch/dma.h> + #include <asm/uaccess.h> + #include <asm/system.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) ++#include <asm/arch/dma.h> + #include <asm/hardware.h> + #include <asm/dma.h> +-#include <asm/io.h> + #include <asm/arch/tc.h> ++#else ++#include <asm/dma.h> ++#include <mach/hardware.h> ++#include <mach/dma.h> ++#include <mach/tc.h> ++#endif ++#include <asm/io.h> + + #include "../interface/sdma.h" + +@@ -229,7 +236,11 @@ + __D("sdma registered major = %d\n", major); + + dma_class = class_create(THIS_MODULE, "sdma"); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) + class_device_create(dma_class, NULL, MKDEV(major, 0), NULL, "sdma"); ++#else ++ device_create(dma_class, NULL, MKDEV(major, 0), NULL, "sdma"); ++#endif + + for (channel = 0; channel < SDMA_NUMCHANNELS; channel++) { + channels[channel].owner = NULL; +@@ -248,7 +259,11 @@ + omap_free_dma(channel); + } + } ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) + class_device_destroy(dma_class, MKDEV(major, 0)); ++#else ++ device_destroy(dma_class, MKDEV(major, 0)); ++#endif + class_destroy(dma_class); + unregister_chrdev(major, "sdma"); + diff --git a/packages/dsplink/files/unloadmodules-ti-codec-engine-apps.sh b/packages/dsplink/files/unloadmodules-ti-codec-engine-apps.sh new file mode 100755 index 0000000000..17436a5937 --- /dev/null +++ b/packages/dsplink/files/unloadmodules-ti-codec-engine-apps.sh @@ -0,0 +1,12 @@ +# Unload modules - CODEC ENGINE - OMAP3530 + +# remove lpm module +rmmod lpm_omap3530 + +# remove DSP/BIOS Link driver +rmmod dsplinkk +rm -f /dev/dsplink + +# remove cmem module +rmmod cmemk + diff --git a/packages/dsplink/files/unloadmodules-ti-dmai-apps.sh b/packages/dsplink/files/unloadmodules-ti-dmai-apps.sh new file mode 100755 index 0000000000..2465c43fe9 --- /dev/null +++ b/packages/dsplink/files/unloadmodules-ti-dmai-apps.sh @@ -0,0 +1,12 @@ +# Unload modules - DMAI - OMAP3530 + +# remove lpm module +rmmod lpm_omap3530 + +# remove DSP/BIOS Link driver +rmmod dsplinkk +rm -f /dev/dsplink + +# remove cmem module +rmmod cmemk + diff --git a/packages/dsplink/files/unloadmodules-ti-dsplink-apps.sh b/packages/dsplink/files/unloadmodules-ti-dsplink-apps.sh new file mode 100755 index 0000000000..8694114a70 --- /dev/null +++ b/packages/dsplink/files/unloadmodules-ti-dsplink-apps.sh @@ -0,0 +1,5 @@ +# Unload modules - DSPLINK - OMAP3530 + +# remove DSP/BIOS Link driver +rmmod dsplinkk +rm -f /dev/dsplink diff --git a/packages/dsplink/ti-codec-engine_2.21.bb b/packages/dsplink/ti-codec-engine_2.21.bb index 2eaa40c0e9..805715bd74 100644 --- a/packages/dsplink/ti-codec-engine_2.21.bb +++ b/packages/dsplink/ti-codec-engine_2.21.bb @@ -8,7 +8,7 @@ RDEPENDS = "update-modules" inherit module # tconf from xdctools dislikes '.' in pwd :/ -PR = "r10" +PR = "r14" PV = "221" # Get CE tarball from TI website, place in sources and calculate @@ -17,11 +17,16 @@ PV = "221" SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21.tar.gz \ file://cmem-class-device-27-and-sched-include-fix.patch;patch=1 \ + file://sdma-class-device-and-includes-fix.patch;patch=1 \ file://dsplink-semaphore-27.patch;patch=1 \ file://lpm-device-create-and-semaphore-include-fix.patch;patch=1 \ file://lpm-make-symbol-warnings-fix.patch;patch=1 \ file://Makefile-dsplink-gpp \ file://Makefile-dsplink-dsp \ + file://loadmodules-ti-dsplink-apps.sh \ + file://unloadmodules-ti-dsplink-apps.sh \ + file://loadmodules-ti-codec-engine-apps.sh \ + file://unloadmodules-ti-codec-engine-apps.sh \ " S = "${WORKDIR}/codec_engine_2_21" @@ -65,7 +70,7 @@ do_compile_append() { echo "LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}" >> ${S}/Rules.make #export DSPLINK=${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/dsplink - # Build the cmem kernel module + # Build the cmem kernel module and associated test apps # We unset CFLAGS because kernel modules need different ones, this is basically a verbatim copy of kernel.bbclass and module-base.bbclass unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS @@ -78,7 +83,27 @@ do_compile_append() { AR="${KERNEL_AR}" fi -#need to add other modules here, like SDMA, etc +#sdma bits + if [ -e ${S}/cetools/packages/ti/sdo/linuxutils/sdma ] ; then + echo "MVTOOL_PREFIX=${TARGET_PREFIX}" > ${S}/Rules.make + echo "UCTOOL_PREFIX=${TARGET_PREFIX}" >> ${S}/Rules.make + echo "LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}" >> ${S}/Rules.make + + # Build the sdma kernel module and associated test apps + # We unset CFLAGS because kernel modules need different ones, this is basically a verbatim copy of kernel.bbclass and module-base.bbclass + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + + cd ${S}/cetools/packages/ti/sdo/linuxutils/sdma + oe_runmake clean + oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ + KERNEL_SRC=${STAGING_KERNEL_DIR} \ + KERNEL_VERSION=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" + fi + + +#need to add other modules here, like IRQ, etc #now build the CE examples @@ -130,8 +155,9 @@ do_compile_append() { do_install_append () { #driver - kernel module install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp - cp ${S}/cetools/packages/ti/sdo/linuxutils/cmem/src/module/cmemk.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp || true cp ${S}/cetools/packages/ti/bios/power/modules/${DSPPOWERSOC}/lpm/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp || true + cp ${S}/cetools/packages/ti/sdo/linuxutils/cmem/src/module/cmemk.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp || true + cp ${S}/cetools/packages/ti/sdo/linuxutils/sdma/src/module/sdmak.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp || true #library #install -d ${D}/${libdir} @@ -142,6 +168,11 @@ do_install_append () { # we change pwd so that find gives us relative path to the files, which we use to create the same structure on the target cd ${S}/examples/ti/sdo/ce + #test app module un/load scripts + install ${WORKDIR}/loadmodules-ti-dsplink-apps.sh ${D}/${datadir}/ti-dsplink + install ${WORKDIR}/unloadmodules-ti-dsplink-apps.sh ${D}/${datadir}/ti-dsplink + + #ce samples # first find all the app files named '.out' for i in $(find . -name "*.out") ; do # first create the directory @@ -174,16 +205,21 @@ do_install_append () { install ${i} ${D}/${datadir}/ti-codec-engine/`dirname ${i}` done + #test app module un/load scripts + install ${WORKDIR}/loadmodules-ti-codec-engine-apps.sh ${D}/${datadir}/ti-codec-engine + install ${WORKDIR}/unloadmodules-ti-codec-engine-apps.sh ${D}/${datadir}/ti-codec-engine + # we should install the CMEM apps as well here # finally, strip targets that we're not supporting here # - TODO... } -PACKAGES =+ "ti-lpm-module ti-cmem-module ti-codec-engine-apps" +PACKAGES =+ "ti-lpm-module ti-cmem-module ti-sdma-module ti-codec-engine-apps" FILES_ti-lpm-module = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/*lpm*ko" FILES_ti-cmem-module = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/cmemk.ko" +FILES_ti-sdma-moduke = "/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/sdmak.ko" FILES_ti-codec-engine-apps = "${datadir}/ti-codec-engine/*" pkg_postinst_ti-lpm-module () { @@ -210,16 +246,29 @@ pkg_postrm_ti-cmem-module () { update-modules || true } +pkg_postinst_ti-sdma-module () { + if [ -n "$D" ]; then + exit 1 + fi + depmod -a + update-modules || true +} + +pkg_postrm_ti-sdma-module () { + update-modules || true +} + INHIBIT_PACKAGE_STRIP = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" #legacy upgrade helpers RPROVIDES_ti-cmem-module += "ti-cmemk-module" +RREPLACES_ti-cmem-module += "ti-cmemk-module" # ti-dsplink-module can be built by either codec-engine or standalone dsplink - tell it to use this one, else unwanted dependence PREFERRED_PROVIDER_ti-dsplink-module = "ti-codec-engine" #add run-time dependencies - note for kernel module we can only use RRECOMMENDS, since modules might be built into the kernel -RRECOMMENDS_ti-codec-engine-apps += "ti-dsplink-module ti-lpm-module ti-cmem-module" +RRECOMMENDS_ti-codec-engine-apps += "ti-dsplink-module ti-lpm-module ti-cmem-module ti-sdma-module" diff --git a/packages/dsplink/ti-dmai_1.20.bb b/packages/dsplink/ti-dmai_1.20.bb index 87dcb38fd9..830143c7f2 100644 --- a/packages/dsplink/ti-dmai_1.20.bb +++ b/packages/dsplink/ti-dmai_1.20.bb @@ -13,12 +13,14 @@ SRC_URI = "file://dmai_1_20_00_06.tar.gz \ file://dmai-do-not-panic-on-mixer-failure.patch;patch=1 \ file://dmai-support-32bit-align.patch;patch=1 \ file://dmai-built-with-angstrom.patch;patch=1 \ + file://loadmodules-ti-dmai-apps.sh \ + file://unloadmodules-ti-dmai-apps.sh \ " S = "${WORKDIR}/dmai_1_20_00_06" # Yes, the xdc stuff still breaks with a '.' in PWD PV = "120" -PR = "r11" +PR = "r12" TARGET = "all" TARGET_neuros-osd2 = " dm6446_al dm6446_db" @@ -55,6 +57,10 @@ do_install () { export EXEC_DIR="${D}/${datadir}/ti-dmai/apps" oe_runmake install + + #test app module un/load scripts + install ${WORKDIR}/loadmodules-ti-dmai-apps.sh ${D}/${datadir}/ti-dmai + install ${WORKDIR}/unloadmodules-ti-dmai-apps.sh ${D}/${datadir}/ti-dmai } do_stage () { diff --git a/packages/gstreamer/gst-plugins-base_0.10.17.bb b/packages/gstreamer/gst-plugins-base_0.10.17.bb new file mode 100644 index 0000000000..0a1f17fcd8 --- /dev/null +++ b/packages/gstreamer/gst-plugins-base_0.10.17.bb @@ -0,0 +1,12 @@ +require gst-plugins.inc + +PROVIDES += "gst-plugins" + +# gst-plugins-base only builds the alsa plugin +# if alsa has been built and is present. You will +# not get an error if this is not present, just +# a missing alsa plugin +DEPENDS += "alsa-lib libsm virtual/libx11 freetype gnome-vfs libxv" + +PR = "r5" + diff --git a/packages/i2c-tools/picodlp-control/picodlp-control b/packages/i2c-tools/picodlp-control/picodlp-control index dd7d9bfd6b..3c3cd5acbb 100755 --- a/packages/i2c-tools/picodlp-control/picodlp-control +++ b/packages/i2c-tools/picodlp-control/picodlp-control @@ -43,8 +43,45 @@ case ${PICO_OPTION} in ${I2C_APP} ${PICO_ADDRESS} wb4 0x26 ${WORD_OFF} fi;; +"rled") + if [ $2 -gt 0 ] ; then + ${I2C_APP} ${PICO_ADDRESS} wb4 0x11 ${WORD_ON} + else + ${I2C_APP} ${PICO_ADDRESS} wb4 0x11 ${WORD_OFF} + fi;; + +"gled") + if [ $2 -gt 0 ] ; then + ${I2C_APP} ${PICO_ADDRESS} wb4 0x12 ${WORD_ON} + else + ${I2C_APP} ${PICO_ADDRESS} wb4 0x12 ${WORD_OFF} + fi;; + +"bled") + if [ $2 -gt 0 ] ; then + ${I2C_APP} ${PICO_ADDRESS} wb4 0x13 ${WORD_ON} + else + ${I2C_APP} ${PICO_ADDRESS} wb4 0x13 ${WORD_OFF} + fi;; + +"itp") + if [ $2 -gt 0 ] ; then + ${I2C_APP} ${PICO_ADDRESS} wb4 0x0B ${WORD_OFF} + ${I2C_APP} ${PICO_ADDRESS} wb4 0x04 ${WORD_ON} + #Parallel RGB Setting + else + ${I2C_APP} ${PICO_ADDRESS} wb4 0x0B $3 + ${I2C_APP} ${PICO_ADDRESS} wb4 0x04 ${WORD_OFF} + #Test Pattern + fi;; +"ledc") + ${I2C_APP} ${PICO_ADDRESS} wb4 0x0E $4 + ${I2C_APP} ${PICO_ADDRESS} wb4 0x0F $5 + ${I2C_APP} ${PICO_ADDRESS} wb4 0x10 $6 + ;; + *) - echo "Usage: $0 vflip|hflip|temporal-enhance 0/1";; + echo "Usage: $0 vflip|hflip|temporal-enhance|rled|gled|bled|itp|ledc 0/1 0x";; esac diff --git a/packages/i2c-tools/picodlp-control_0.1.bb b/packages/i2c-tools/picodlp-control_0.1.bb index 79a896b35e..5fb5630d87 100644 --- a/packages/i2c-tools/picodlp-control_0.1.bb +++ b/packages/i2c-tools/picodlp-control_0.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Small application to control the pico DLP over I2C" LICENSE = "GPLv3" -PR = "r2" +PR = "r3" SRC_URI = "file://*.c file://*.h file://${PN}" diff --git a/packages/ntpclient/ntpclient_2007_365.bb b/packages/ntpclient/ntpclient_2007_365.bb index b892f384e7..b7988ab5bb 100644 --- a/packages/ntpclient/ntpclient_2007_365.bb +++ b/packages/ntpclient/ntpclient_2007_365.bb @@ -4,7 +4,7 @@ AUTHOR = "Larry Doolittle <larry@doolittle.boa.org>" RDEPENDS = "busybox" SECTION = "admin" LICENSE = "GPLv2" -PR = "r0" +PR = "r2" # The ntpclient package uses version numbers that include an underscore :( PV = "2007_365" # ntpclient unpacks into a directory that doesn't include version info :( @@ -27,8 +27,15 @@ do_compile() { do_install () { # Install the binary and tools install -D -m 0755 ${S}/ntpclient ${D}${base_sbindir}/ntpclient - install -D -m 0755 ${S}/adjtimex ${D}${base_sbindir}/adjtimex + install -D -m 0755 ${S}/adjtimex ${D}${base_sbindir}/adjtimex.${PN} install -D -m 0755 ${S}/rate.awk ${D}${sbindir}/ntpclient-drift-rate.awk install -D -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ntpclient } +pkg_postinst_${PN} () { + update-alternatives --install ${base_sbindir}/adjtimex adjtimex adjtimex.${PN} 100 +} + +pkg_prerm_${PN} () { + update-alternatives --remove adjtimex adjtimex.${PN} +} |