From: David-John Willis Date: Thu, 19 Feb 2009 22:11:28 +0000 (+0000) Subject: Cleanup part of my local tree to push up to git.openpandora.org. Not taking history... X-Git-Tag: Release-2010-05/1~204 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=commitdiff_plain;h=287a84960fe62e44918d7c7f389464b5befb2e16 Cleanup part of my local tree to push up to git.openpandora.org. Not taking history from my local trees. --- diff --git a/packages/images/pandora-core-image.bb b/packages/images/pandora-core-image.bb index 56d71fb..04561d3 100755 --- a/packages/images/pandora-core-image.bb +++ b/packages/images/pandora-core-image.bb @@ -1,27 +1,31 @@ # Console image for Pandora handheld console -inherit image +IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" + +ANGSTROM_EXTRA_INSTALL ?= "" -IMAGE_LINGUAS = "en-gb en-us" +export IMAGE_BASENAME = "pandora-core-image" DEPENDS = "task-base" IMAGE_INSTALL += " \ + ${ANGSTROM_EXTRA_INSTALL} \ task-pandora-core \ " - -# pandora-set-root-password \ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" +#Dont use on core images as you have no GUI to let you set a root password ;). +#zap root password for release images #ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' -#ROOTFS_POSTPROCESS_COMMAND += "set_image_autologin; " +inherit image # Helper to say what image we built, include GIT tag and image name. PANDORA_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/op-version" ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${PANDORA_VERSION_FILE};cd $OLD_PWD;" ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${PANDORA_VERSION_FILE}; cd $OLD_PWD;" ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${PANDORA_VERSION_FILE}; cd $OLD_PWD;" -ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${PANDORA_VERSION_FILE};" +ROOTFS_POSTPROCESS_COMMAND += "echo Image Builder: '${LOGNAME}'@`cat /etc/hostname` >> ${PANDORA_VERSION_FILE};" ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${PANDORA_VERSION_FILE};" +ROOTFS_POSTPROCESS_COMMAND += "echo Base Image Name: '${IMAGE_BASENAME}' >> ${PANDORA_VERSION_FILE};" diff --git a/packages/images/pandora-desktop-image.bb b/packages/images/pandora-desktop-image.bb index f2d8669..098aa88 100755 --- a/packages/images/pandora-desktop-image.bb +++ b/packages/images/pandora-desktop-image.bb @@ -1,27 +1,38 @@ -# E17 demo image for Pandora handheld console +# Desktop image for Pandora handheld console -inherit image +IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" + +XSERVER ?= "xserver-xorg \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-video-fbdev \ + xf86-input-keyboard \ +" -IMAGE_LINGUAS = "en-gb en-us" +ANGSTROM_EXTRA_INSTALL ?= "" + +export IMAGE_BASENAME = "pandora-desktop-image" DEPENDS = "task-base" IMAGE_INSTALL += " \ + ${XSERVER} \ + ${ANGSTROM_EXTRA_INSTALL} \ task-pandora-desktop \ " -# pandora-set-root-password \ - IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" +#zap root password for release images #ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' -#ROOTFS_POSTPROCESS_COMMAND += "set_image_autologin; " +inherit image # Helper to say what image we built, include GIT tag and image name. PANDORA_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/op-version" ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${PANDORA_VERSION_FILE};cd $OLD_PWD;" ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${PANDORA_VERSION_FILE}; cd $OLD_PWD;" ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${PANDORA_VERSION_FILE}; cd $OLD_PWD;" -ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${PANDORA_VERSION_FILE};" +ROOTFS_POSTPROCESS_COMMAND += "echo Image Builder: '${LOGNAME}'@`cat /etc/hostname` >> ${PANDORA_VERSION_FILE};" ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${PANDORA_VERSION_FILE};" +ROOTFS_POSTPROCESS_COMMAND += "echo Base Image Name: '${IMAGE_BASENAME}' >> ${PANDORA_VERSION_FILE};" diff --git a/packages/images/pandora-gui-image.bb b/packages/images/pandora-gui-image.bb index a6b1aeb..779f955 100755 --- a/packages/images/pandora-gui-image.bb +++ b/packages/images/pandora-gui-image.bb @@ -1,27 +1,38 @@ # Default matchbox image for the Pandora -inherit image +IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" + +XSERVER ?= "xserver-xorg \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-video-fbdev \ + xf86-input-keyboard \ +" -IMAGE_LINGUAS = "en-gb en-us" +ANGSTROM_EXTRA_INSTALL ?= "" + +export IMAGE_BASENAME = "pandora-gui-image" DEPENDS = "task-base" -IMAGE_INSTALL = " \ +IMAGE_INSTALL += " \ + ${XSERVER} \ + ${ANGSTROM_EXTRA_INSTALL} \ task-pandora-gui \ " -# pandora-set-root-password \ - IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" +#zap root password for release images #ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' -#ROOTFS_POSTPROCESS_COMMAND += "set_image_autologin; " +inherit image # Helper to say what image we built, include GIT tag and image name. PANDORA_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/op-version" ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${PANDORA_VERSION_FILE};cd $OLD_PWD;" ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${PANDORA_VERSION_FILE}; cd $OLD_PWD;" ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${PANDORA_VERSION_FILE}; cd $OLD_PWD;" -ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${PANDORA_VERSION_FILE};" +ROOTFS_POSTPROCESS_COMMAND += "echo Image Builder: '${LOGNAME}'@`cat /etc/hostname` >> ${PANDORA_VERSION_FILE};" ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${PANDORA_VERSION_FILE};" +ROOTFS_POSTPROCESS_COMMAND += "echo Base Image Name: '${IMAGE_BASENAME}' >> ${PANDORA_VERSION_FILE};" diff --git a/packages/images/pandora-satogui-image.bb b/packages/images/pandora-satogui-image.bb index 1af71a5..e19cc1d 100755 --- a/packages/images/pandora-satogui-image.bb +++ b/packages/images/pandora-satogui-image.bb @@ -2,7 +2,7 @@ inherit image -IMAGE_LINGUAS = "en-gb en-us" +IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" DEPENDS = "task-base" @@ -23,5 +23,6 @@ PANDORA_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/op-version" ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${PANDORA_VERSION_FILE};cd $OLD_PWD;" ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${PANDORA_VERSION_FILE}; cd $OLD_PWD;" ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${PANDORA_VERSION_FILE}; cd $OLD_PWD;" -ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${PANDORA_VERSION_FILE};" +ROOTFS_POSTPROCESS_COMMAND += "echo Image Builder: '${LOGNAME}'@`cat /etc/hostname` >> ${PANDORA_VERSION_FILE};" ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${PANDORA_VERSION_FILE};" +ROOTFS_POSTPROCESS_COMMAND += "echo Base Image Name: '${IMAGE_BASENAME}' >> ${PANDORA_VERSION_FILE};" diff --git a/packages/images/pandora-validation-image.bb b/packages/images/pandora-validation-image.bb index f3b38f2..c648045 100755 --- a/packages/images/pandora-validation-image.bb +++ b/packages/images/pandora-validation-image.bb @@ -1,30 +1,31 @@ # Validation image for Pandora handheld console # for hardware testing and flashing images to NAND if copied to the SD in the correct places. -inherit image +IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" + +ANGSTROM_EXTRA_INSTALL ?= "" -IMAGE_LINGUAS = "en-gb en-us" +export IMAGE_BASENAME = "pandora-validation-image" DEPENDS = "task-base" IMAGE_INSTALL += " \ - task-pandora-core \ + ${ANGSTROM_EXTRA_INSTALL} \ task-pandora-validation \ " -# pandora-set-root-password \ - IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" +#zap root password for release images #ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' -#ROOTFS_POSTPROCESS_COMMAND += "set_image_autologin; " +inherit image # Helper to say what image we built, include GIT tag and image name. PANDORA_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/op-version" ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${PANDORA_VERSION_FILE};cd $OLD_PWD;" ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${PANDORA_VERSION_FILE}; cd $OLD_PWD;" ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${PANDORA_VERSION_FILE}; cd $OLD_PWD;" -ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${PANDORA_VERSION_FILE};" +ROOTFS_POSTPROCESS_COMMAND += "echo Image Builder: '${LOGNAME}'@`cat /etc/hostname` >> ${PANDORA_VERSION_FILE};" ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${PANDORA_VERSION_FILE};" - +ROOTFS_POSTPROCESS_COMMAND += "echo Base Image Name: '${IMAGE_BASENAME}' >> ${PANDORA_VERSION_FILE};" diff --git a/packages/linux/omap3-pandora-kernel/0001-Add-EHCI-patch-suggested-by-Steven-Kipisz.patch b/packages/linux/omap3-pandora-kernel/0001-Add-EHCI-patch-suggested-by-Steven-Kipisz.patch new file mode 100755 index 0000000..9f4d908 --- /dev/null +++ b/packages/linux/omap3-pandora-kernel/0001-Add-EHCI-patch-suggested-by-Steven-Kipisz.patch @@ -0,0 +1,52 @@ +From 59bbce22b1cf483d840f302d11e7e8901b4b470c Mon Sep 17 00:00:00 2001 +From: David-John Willis +Date: Sun, 8 Feb 2009 18:38:20 +0000 +Subject: [PATCH] Add EHCI patch suggested by Steven Kipisz. + +--- + drivers/usb/host/ehci-omap.c | 26 ++++++++++++++++++++++++++ + 1 files changed, 26 insertions(+), 0 deletions(-) + mode change 100644 => 100755 drivers/usb/host/ehci-omap.c + +diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c +old mode 100644 +new mode 100755 +index ce975cf..3c01a91 +--- a/drivers/usb/host/ehci-omap.c ++++ b/drivers/usb/host/ehci-omap.c +@@ -237,6 +237,32 @@ static int omap_start_ehc(struct platform_device *dev, struct usb_hcd *hcd) + udelay(EXT_PHY_RESET_DELAY); + #endif + ++ /* ++ * The PHY register 0x7 - Interface Control register is ++ * configured to disable the integrated STP pull-up resistor ++ * used for interface protection. ++ * ++ * May not need to be here. ++ */ ++ omap_writel((0x7 << EHCI_INSNREG05_ULPI_REGADD_SHIFT) |/* interface reg */ ++ (2 << EHCI_INSNREG05_ULPI_OPSEL_SHIFT) |/* Write */ ++ (1 << EHCI_INSNREG05_ULPI_PORTSEL_SHIFT) |/* Port1 */ ++ (1 << EHCI_INSNREG05_ULPI_CONTROL_SHIFT) |/* Start */ ++ (PHY_STP_PULLUP_DISABLE), ++ EHCI_INSNREG05_ULPI); ++ ++ while (!(omap_readl(EHCI_INSNREG05_ULPI) & (1<usbtll_fck_clk = clk_get(&dev->dev, USBHOST_TLL_FCLK); + if (IS_ERR(ehci_clocks->usbtll_fck_clk)) +-- +1.6.0.5 + diff --git a/packages/linux/omap3-pandora-kernel/0002-Add-missing-define-to-EHCI-OMAP.c.patch b/packages/linux/omap3-pandora-kernel/0002-Add-missing-define-to-EHCI-OMAP.c.patch new file mode 100755 index 0000000..20bc83f --- /dev/null +++ b/packages/linux/omap3-pandora-kernel/0002-Add-missing-define-to-EHCI-OMAP.c.patch @@ -0,0 +1,31 @@ +From b74c0765335d460ae84549f5977ffed588a26c23 Mon Sep 17 00:00:00 2001 +From: David-John Willis +Date: Sun, 8 Feb 2009 18:58:35 +0000 +Subject: [PATCH] Add missing define to EHCI-OMAP.c + +--- + drivers/usb/host/ehci-omap.c | 7 +++++-- + 1 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c +index 3c01a91..b3c1c35 100755 +--- a/drivers/usb/host/ehci-omap.c ++++ b/drivers/usb/host/ehci-omap.c +@@ -50,9 +50,12 @@ + #define EXTERNAL_PHY_RESET + //#define EXT_PHY_RESET_GPIO_PORT1 (57) + //#define EXT_PHY_RESET_GPIO_PORT1 (147) +-#define EXT_PHY_RESET_GPIO_PORT1 (16) ++#define EXT_PHY_RESET_GPIO_PORT1 (16) + //#define EXT_PHY_RESET_GPIO_PORT2 (61) +-#define EXT_PHY_RESET_DELAY (10) ++#define EXT_PHY_RESET_DELAY (10) ++ ++#define PHY_STP_PULLUP_ENABLE (0x10) ++#define PHY_STP_PULLUP_DISABLE (0x90) + + /* ISSUE2: + * USBHOST supports External charge pump PHYs only +-- +1.6.0.5 + diff --git a/packages/linux/omap3-pandora-kernel/defconfig b/packages/linux/omap3-pandora-kernel/defconfig index 9fa00d8..d8f2cea 100755 --- a/packages/linux/omap3-pandora-kernel/defconfig +++ b/packages/linux/omap3-pandora-kernel/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.27-omap1 -# Mon Jan 12 18:36:10 2009 +# Sat Feb 7 21:23:56 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -25,7 +25,6 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_SUPPORTS_AOUT=y CONFIG_ZONE_DMA=y CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y -CONFIG_OPROFILE_ARMV7=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -57,6 +56,8 @@ CONFIG_FAIR_GROUP_SCHED=y # CONFIG_RT_GROUP_SCHED is not set CONFIG_USER_SCHED=y # CONFIG_CGROUP_SCHED is not set +# CONFIG_CGROUP_CPUACCT is not set +# CONFIG_RESOURCE_COUNTERS is not set CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_RELAY is not set @@ -67,7 +68,7 @@ CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" -CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_EMBEDDED=y CONFIG_UID16=y @@ -131,11 +132,11 @@ CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y -# CONFIG_DEFAULT_AS is not set +CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_DEFAULT_IOSCHED="anticipatory" CONFIG_CLASSIC_RCU=y # @@ -271,7 +272,7 @@ CONFIG_HAS_TLS_REG=y # Kernel Features # CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ=y +# CONFIG_NO_HZ is not set CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y # CONFIG_PREEMPT is not set @@ -310,7 +311,21 @@ CONFIG_ATAGS_PROC=y # # CPU Frequency scaling # -# CONFIG_CPU_FREQ is not set +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +# CONFIG_CPU_FREQ_DEBUG is not set +CONFIG_CPU_FREQ_STAT=y +# CONFIG_CPU_FREQ_STAT_DETAILS is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # # Floating point emulation @@ -319,9 +334,6 @@ CONFIG_ATAGS_PROC=y # # At least one emulation must be selected # -CONFIG_FPE_NWFPE=y -# CONFIG_FPE_NWFPE_XP is not set -# CONFIG_FPE_FASTFPE is not set CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_NEON=y @@ -330,7 +342,7 @@ CONFIG_NEON=y # Userspace binary formats # CONFIG_BINFMT_ELF=y -CONFIG_BINFMT_AOUT=m +# CONFIG_BINFMT_AOUT is not set CONFIG_BINFMT_MISC=y # @@ -338,9 +350,7 @@ CONFIG_BINFMT_MISC=y # CONFIG_PM=y # CONFIG_PM_DEBUG is not set -CONFIG_PM_SLEEP=y -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y +# CONFIG_SUSPEND is not set # CONFIG_APM_EMULATION is not set CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_NET=y @@ -442,11 +452,12 @@ CONFIG_BT_HIDP=y # # Bluetooth device drivers # -CONFIG_BT_HCIUSB=y -CONFIG_BT_HCIUSB_SCO=y -# CONFIG_BT_HCIBTUSB is not set +CONFIG_BT_HCIBTUSB=y CONFIG_BT_HCIBTSDIO=y -# CONFIG_BT_HCIUART is not set +CONFIG_BT_HCIUART=y +# CONFIG_BT_HCIUART_H4 is not set +# CONFIG_BT_HCIUART_BCSP is not set +# CONFIG_BT_HCIUART_LL is not set CONFIG_BT_HCIBCM203X=y CONFIG_BT_HCIBPA10X=y # CONFIG_BT_HCIBFUSB is not set @@ -474,7 +485,7 @@ CONFIG_MAC80211_RC_DEFAULT="pid" CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_IEEE80211=y -# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_DEBUG=y CONFIG_IEEE80211_CRYPT_WEP=y CONFIG_IEEE80211_CRYPT_CCMP=y CONFIG_IEEE80211_CRYPT_TKIP=y @@ -624,7 +635,7 @@ CONFIG_CHR_DEV_SCH=m # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs # -CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_MULTI_LUN is not set # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set # CONFIG_SCSI_SCAN_ASYNC is not set @@ -652,6 +663,7 @@ CONFIG_NETDEVICES=y # CONFIG_TUN is not set # CONFIG_VETH is not set # CONFIG_NET_ETHERNET is not set +CONFIG_MII=y # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set @@ -959,7 +971,6 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_HTC_EGPIO is not set # CONFIG_HTC_PASIC3 is not set CONFIG_TWL4030_CORE=y -CONFIG_TWL4030_POWER=y # CONFIG_MFD_TMIO is not set # CONFIG_MFD_T7L66XB is not set # CONFIG_MFD_TC6387XB is not set @@ -1170,6 +1181,7 @@ CONFIG_DVB_LNBP21=m # CONFIG_DVB_ISL6405 is not set CONFIG_DVB_ISL6421=m CONFIG_DAB=y +# CONFIG_USB_DABUSB is not set # # Graphics support @@ -1207,7 +1219,8 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_LCD_CLASS_DEVICE is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_CORGI is not set -CONFIG_BACKLIGHT_GPIO=y +# CONFIG_BACKLIGHT_GPIO is not set +CONFIG_BACKLIGHT_TWL4030_PWM0=y # # Display device support @@ -1254,12 +1267,13 @@ CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=y CONFIG_SND_PCM_OSS=y CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_SEQUENCER_OSS is not set # CONFIG_SND_DYNAMIC_MINORS is not set CONFIG_SND_SUPPORT_OLD_API=y CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set -CCONFIG_SND_DRIVERS=y +CONFIG_SND_DRIVERS=y # CONFIG_SND_DUMMY is not set # CONFIG_SND_VIRMIDI is not set # CONFIG_SND_MTPAV is not set @@ -1284,7 +1298,7 @@ CONFIG_SND_SOC_TWL4030=y # CONFIG_SOUND_PRIME is not set CONFIG_HID_SUPPORT=y CONFIG_HID=y -CONFIG_HID_DEBUG=y +# CONFIG_HID_DEBUG is not set # CONFIG_HIDRAW is not set # @@ -1339,10 +1353,8 @@ CONFIG_USB_MUSB_SOC=y CONFIG_USB_MUSB_OTG=y CONFIG_USB_GADGET_MUSB_HDRC=y CONFIG_USB_MUSB_HDRC_HCD=y -# CONFIG_MUSB_PIO_ONLY is not set -CONFIG_USB_INVENTRA_DMA=y -# CONFIG_USB_TI_CPPI_DMA is not set -# CONFIG_USB_MUSB_DEBUG is not set +CONFIG_MUSB_PIO_ONLY=y +CONFIG_USB_MUSB_DEBUG=y # # USB Device Class drivers @@ -1372,7 +1384,7 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_ONETOUCH is not set # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set -# CONFIG_USB_LIBUSUAL is not set +CONFIG_USB_LIBUSUAL=y # # USB Imaging devices @@ -1457,16 +1469,16 @@ CONFIG_USB_LED=m # CONFIG_USB_IDMOUSE is not set # CONFIG_USB_FTDI_ELAN is not set # CONFIG_USB_APPLEDISPLAY is not set -# CONFIG_USB_SISUSBVGA is not set +CONFIG_USB_SISUSBVGA=m +# CONFIG_USB_SISUSBVGA_CON is not set # CONFIG_USB_LD is not set -# CONFIG_USB_TRANCEVIBRATOR is not set +CONFIG_USB_TRANCEVIBRATOR=m # CONFIG_USB_IOWARRIOR is not set CONFIG_USB_TEST=m # CONFIG_USB_ISIGHTFW is not set CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set -# CONFIG_USB_GADGET_DEBUG_FS is not set CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_AMD5536UDC is not set # CONFIG_USB_GADGET_ATMEL_USBA is not set @@ -1485,12 +1497,13 @@ CONFIG_USB_GADGET_DUALSPEED=y # CONFIG_USB_ZERO is not set CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set -# CONFIG_USB_MIDI_GADGET is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m +CONFIG_USB_MIDI_GADGET=m # CONFIG_USB_G_PRINTER is not set -# CONFIG_USB_CDC_COMPOSITE is not set +CONFIG_USB_CDC_COMPOSITE=m CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_UNSAFE_RESUME=y @@ -1509,12 +1522,6 @@ CONFIG_SDIO_UART=y # # CONFIG_MMC_SDHCI is not set CONFIG_MMC_OMAP_HS=y -CONFIG_MMC_SPI=m -CONFIG_OMAP_HS_MMC1=y -CONFIG_OMAP_HS_MMC2=y -CONFIG_OMAP_HS_MMC3=y -CONFIG_TIWLAN_SDIO=y -CONFIG_TIWLAN_MMC_CONTROLLER=3 # CONFIG_MMC_SPI is not set CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y @@ -1612,13 +1619,15 @@ CONFIG_RTC_DRV_TWL4030=y # File systems # CONFIG_EXT2_FS=y -# CONFIG_EXT2_FS_XATTR is not set +CONFIG_EXT2_FS_XATTR=y +# CONFIG_EXT2_FS_POSIX_ACL is not set +# CONFIG_EXT2_FS_SECURITY is not set # CONFIG_EXT2_FS_XIP is not set CONFIG_EXT3_FS=y # CONFIG_EXT3_FS_XATTR is not set # CONFIG_EXT4DEV_FS is not set CONFIG_JBD=y -# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y @@ -1699,7 +1708,7 @@ CONFIG_JFFS2_RUBIN=y CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_JFFS2_CMODE_SIZE is not set # CONFIG_JFFS2_CMODE_FAVOURLZO is not set -# CONFIG_CRAMFS is not set +CONFIG_CRAMFS=m # CONFIG_VXFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_OMFS_FS is not set @@ -1707,7 +1716,9 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set +CONFIG_UFS_FS=y +CONFIG_UFS_FS_WRITE=y +# CONFIG_UFS_DEBUG is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y CONFIG_NFS_V3=y @@ -1860,10 +1871,6 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KEYS is not set # CONFIG_SECURITY is not set # CONFIG_SECURITY_FILE_CAPABILITIES is not set -CONFIG_XOR_BLOCKS=m -CONFIG_ASYNC_CORE=m -CONFIG_ASYNC_MEMCPY=m -CONFIG_ASYNC_XOR=m CONFIG_CRYPTO=y # diff --git a/packages/linux/omap3-pandora-kernel_2.6.27-pandora.bb b/packages/linux/omap3-pandora-kernel_2.6.27-pandora.bb index 441c59e..82a145c 100755 --- a/packages/linux/omap3-pandora-kernel_2.6.27-pandora.bb +++ b/packages/linux/omap3-pandora-kernel_2.6.27-pandora.bb @@ -5,14 +5,26 @@ KERNEL_IMAGETYPE = "uImage" COMPATIBLE_MACHINE = "omap3-pandora" -SRCREV = "33280e83ef2260f8f6ba01345c5d75a9d97a49c0" +#GIT HEAD 9th Feb +SRCREV = "0a92d456b556a54589c09737276883014853953a" -#PV = "2.6.27-pandora+git${SRCREV}" -PR = "r15" +#GIT HEAD 7th Feb +#SRCREV = "98000fc8f72fd9d35ae2fea0528e756febbe0916" + +#MMC3/WiFi commit +#SRCREV = "33280e83ef2260f8f6ba01345c5d75a9d97a49c0" + +#Pre MMC3 +#SRCREV = "fdb85aeee5f1993265bf46d4dfeae32a3fb8b886" + +PV = "2.6.27-pandora+${PR}+git${SRCREV}" +PR = "r1.5" SRC_URI = " \ git://openpandora.org/pandora-kernel.git;protocol=git;branch=pandora-27-omap1 \ file://defconfig \ + file://0001-Add-EHCI-patch-suggested-by-Steven-Kipisz.patch;patch=1 \ + file://0002-Add-missing-define-to-EHCI-OMAP.c.patch;patch=1 \ file://no-empty-flash-warnings.patch;patch=1 \ file://oprofile-0.9.3.armv7.diff;patch=1 \ file://no-cortex-deadlock.patch;patch=1 \ @@ -40,7 +52,3 @@ SRC_URI = " \ " S = "${WORKDIR}/git" - -#do_configure_prepend() { -# install -m 0644 ${S}/arch/arm/configs/omap3_pandora_defconfig ${WORKDIR}/defconfig -#} diff --git a/packages/pandora-system/pandora-firmware.bb b/packages/pandora-system/pandora-firmware.bb index 9faf707..5c7c7a1 100755 --- a/packages/pandora-system/pandora-firmware.bb +++ b/packages/pandora-system/pandora-firmware.bb @@ -1,23 +1,23 @@ DESCRIPTION = "Install binary firmware for Bluetooth and WiFi into the image." -SUMMARY = "This is required to support the Bluetooth and WiFi modules on the Pandora" -LICENCE = "proprietary-binary" - -COMPATIBLE_MACHINE = "omap3-pandora" -PR = "r1" +LICENSE = "proprietary-binary" +RRECOMMENDS_${PN} = "kernel-module-firmware-class" +PR = "r4" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -RRECOMMENDS = "kernel-module-firmware-class" - -SRC_URI = "file://brf6300.bin \ - file://Fw1251r1c.bin \ +SRC_URI = " \ + file://brf6300.bin \ + file://Fw1251r1c.bin \ " +SUMMARY = "This is required to support the Bluetooth and WiFi modules on the Pandora" S = "${WORKDIR}" -FILES_${PN} = "/lib" - do_install() { - install -d ${D}/lib/firmware/ - install -m 0644 ${S}/brf6300.bin ${S}/Fw1251r1c.bin ${D}/lib/firmware/ + install -d ${D}/lib/firmware + install -m 0644 ${S}/brf6300.bin ${S}/Fw1251r1c.bin ${D}/lib/firmware/ } + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +FILES_${PN} += "/lib/firmware" + +COMPATIBLE_MACHINE = "omap3-pandora" diff --git a/packages/pandora-system/pandora-wifi-tools_git.bb b/packages/pandora-system/pandora-wifi-tools_git.bb index ff968e7..52fff61 100755 --- a/packages/pandora-system/pandora-wifi-tools_git.bb +++ b/packages/pandora-system/pandora-wifi-tools_git.bb @@ -25,5 +25,4 @@ do_install() { # install -m 0755 ${S}/tiwlan_loader ${D}${bindir} } -FILES_${PN} = "/usr/bin/wlan_cu /usr/bin/tiwlan_loader" - +FILES_${PN} += "${bindir} ${sbindir} ${bindir}/wlan_cu ${bindir}/tiwlan_loader" diff --git a/packages/pandora-system/pandora-wifi.inc b/packages/pandora-system/pandora-wifi.inc index 0b9f585..05020a0 100755 --- a/packages/pandora-system/pandora-wifi.inc +++ b/packages/pandora-system/pandora-wifi.inc @@ -1,23 +1,23 @@ -inherit module - -COMPATIBLE_MACHINE = "omap3-pandora" - -SRCREV = "f768d7ee7914d13a4277270774417b5e0f367701" - SRC_URI = " \ - git://openpandora.org/pandora-wifi.git;protocol=git;branch=pandora \ + git://openpandora.org/pandora-wifi.git;protocol=git;branch=pandora \ " +SRCREV = "f768d7ee7914d13a4277270774417b5e0f367701" + S = "${WORKDIR}/git" +inherit module + EXTRA_OEMAKE = " \ - 'KERNELVER=${KERNEL_VERSION}' \ - 'LINUXSRC=${STAGING_KERNEL_DIR}' \ - 'CC=${TARGET_PREFIX}' \ - 'OS=${TARGET_OS}'" + 'KERNELVER=${KERNEL_VERSION}' \ + 'LINUXSRC=${STAGING_KERNEL_DIR}' \ + 'CC=${TARGET_PREFIX}' \ + 'OS=${TARGET_OS}'" -KCFLAGS = "-D__KERNEL__ -DMODULE \ - -I. -I${STAGING_KERNEL_DIR}/include \ - ${CFLAGS}" +COMPATIBLE_MACHINE = "omap3-pandora" MAKE_TARGETS = "BUILD=debug ARCH=arm CROSS_COMPILE=${TARGET_PREFIX} KERNEL_DIR=${STAGING_KERNEL_DIR} OUTPUT_DIR=${S} AR=ar" + +KCFLAGS = "-D__KERNEL__ -DMODULE \ + -I. -I${STAGING_KERNEL_DIR}/include \ + ${CFLAGS}" diff --git a/packages/pandora-system/pandora-wifi/rc.tiwifi b/packages/pandora-system/pandora-wifi/rc.tiwifi new file mode 100755 index 0000000..a19dc83 --- /dev/null +++ b/packages/pandora-system/pandora-wifi/rc.tiwifi @@ -0,0 +1,5 @@ +#!/bin/sh + +rmmod wlan + +insmod $(busybox find /lib/modules/$(uname -r) -name "wlan.ko") diff --git a/packages/pandora-system/pandora-wifi_git.bb b/packages/pandora-system/pandora-wifi_git.bb index 406df0c..a331e8c 100755 --- a/packages/pandora-system/pandora-wifi_git.bb +++ b/packages/pandora-system/pandora-wifi_git.bb @@ -1,17 +1,30 @@ DESCRIPTION = "Kernel drivers for the TI1251 WiFi chip found on the Pandora - Connected via SDIO" LICENSE = "GPLv2" -PR = "r8" +PR = "r9" # Check the include for the source location/GIT SRCREV etc. require pandora-wifi.inc +SRC_URI += " \ + file://rc.tiwifi \ +" + +inherit update-rc.d + +INITSCRIPT_NAME = "tiwifi-init" +INITSCRIPT_PARAMS = "start 30 5 2 . stop 40 0 1 6 ." + do_compile_prepend() { - cd ${S}/sta_dk_4_0_4_32/ + cd ${S}/sta_dk_4_0_4_32/ } do_install() { - cd ${S}/sta_dk_4_0_4_32/ - mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net - cp ${S}/sta_dk_4_0_4_32/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net + cd ${S}/sta_dk_4_0_4_32/ + mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net + cp ${S}/sta_dk_4_0_4_32/*.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net + install -d ${D}${sysconfdir}/init.d/ + cp -pP ${WORKDIR}/rc.tiwifi ${D}${sysconfdir}/init.d/tiwifi-init } + +FILES_${PN} += "/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/*.ko.*" \ No newline at end of file diff --git a/packages/tasks/task-pandora-core.bb b/packages/tasks/task-pandora-core.bb index 3b1ea75..c26830d 100755 --- a/packages/tasks/task-pandora-core.bb +++ b/packages/tasks/task-pandora-core.bb @@ -1,54 +1,55 @@ DESCRIPTION = "Task file for default core/console apps in the Pandora image" +# Use this task as a base to ship all kernel modules and make sure firmware and drivers are installed for BT and WiFi. +# Please see metadata/openpandora.oe.git/packages/pandora-system/pandora-firmware/pandora-firmware/readme.txt for info on the hacks for firmware. + # Don't forget to bump the PR if you change it. -PR = "r12" +PR = "r1.8" inherit task RDEPENDS_${PN} = "\ - task-base-extended \ - task-proper-tools \ - pandora-wifi \ - pandora-firmware \ - libgles-omap3 \ - libwiimote \ - nfs-utils \ - nfs-utils-client \ -# unionfs-modules \ - unionfs-utils \ - tslib \ - tslib-tests \ - tslib-calibrate \ - pointercal \ - bash \ - bzip2 \ - psplash \ - mkfs-jffs2 \ - fbgrab \ - fbset \ - portmap \ - fbset-modes \ - fuse \ - socat \ - strace \ - python-pygame \ - ksymoops \ - kexec-tools \ - minicom \ - nano \ -# mono \ - alsa-utils \ - alsa-utils-alsactl \ - alsa-utils-alsamixer \ - alsa-utils-aplay \ - openssh-scp \ - openssh-ssh \ - bluez-hcidump \ - bluez-utils \ - wireless-tools \ - rdesktop \ - zip \ - openssh-scp openssh-ssh \ -# networkmanager \ + task-base-extended \ + task-proper-tools \ + pandora-firmware \ + pandora-wifi pandora-wifi-tools \ + omap3-deviceid \ + omap3-sgx-modules libgles-omap3 \ + libwiimote \ + libsdl-gfx \ + nfs-utils nfs-utils-client \ + i2c-tools \ + tslib tslib-tests tslib-calibrate pointercal \ + bash \ + bzip2 \ + psplash \ + fbgrab fbset fbset-modes \ + portmap \ + fuse sshfs-fuse ntfs-3g \ + file \ + aufs \ + socat \ + strace \ + python-pygame \ + ksymoops \ + kexec-tools \ + minicom \ + nano \ + alsa-utils alsa-utils-alsactl alsa-utils-alsamixer alsa-utils-aplay \ + openssh-scp \ + openssh-ssh \ + bluez4 bluez-hcidump bluez-utils \ + wireless-tools \ + rdesktop \ + zip \ + openssh-scp openssh-ssh \ + mplayer \ + networkmanager netm-cli \ " + +# Make sure we install all kernel modules with the Pandora images +RRECOMMENDS_${PN} += "kernel-modules" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +RRECOMMENDS_${PN}_append_armv7a = " omapfbplay" diff --git a/packages/tasks/task-pandora-desktop.bb b/packages/tasks/task-pandora-desktop.bb index c8ca4f6..4c76446 100755 --- a/packages/tasks/task-pandora-desktop.bb +++ b/packages/tasks/task-pandora-desktop.bb @@ -1,25 +1,23 @@ -DESCRIPTION = "Task file for default GUI apps in the Pandora image" +DESCRIPTION = "Task file for the 'desktop' Pandora image" # Don't forget to bump the PR if you change it. -PR = "r3" +PR = "r1.6" inherit task -ECONFIG ?= "e-wm-config-angstrom e-wm-config-default" +ECONFIG ?= "places e-wm-config-angstrom e-wm-config-default" RDEPENDS_${PN} = "\ task-pandora-core \ - ${XSERVER} \ angstrom-x11-base-depends \ - angstrom-gpe-task-base \ - angstrom-gpe-task-settings \ + angstrom-gpe-task-base angstrom-gpe-task-game angstrom-ohand-task-pim angstrom-gpe-task-apps angstrom-gpe-task-settings \ angstrom-zeroconf-audio \ angstrom-led-config \ gpe-scap \ mime-support e-wm ${ECONFIG} exhibit \ xterm xmms \ - epiphany firefox midori \ + firefox midori \ swfdec-mozilla \ hicolor-icon-theme gnome-icon-theme \ jaaa nmap iperf gnuplot \ @@ -28,12 +26,13 @@ RDEPENDS_${PN} = "\ gimp \ powertop oprofile \ pidgin \ - mplayer \ - omapfbplay \ gnome-games \ stalonetray \ synergy \ - x11vnc \ - angstrom-gnome-icon-theme-enable \ -# network-manager-applet \ + x11vnc angstrom-x11vnc-xinit \ + angstrom-gnome-icon-theme-enable \ + connman-gnome \ +# networkmanager-applet \ + scummvm \ + ogre-egl \ " diff --git a/packages/tasks/task-pandora-gui.bb b/packages/tasks/task-pandora-gui.bb index e804ed2..7bc8ff5 100755 --- a/packages/tasks/task-pandora-gui.bb +++ b/packages/tasks/task-pandora-gui.bb @@ -2,52 +2,50 @@ DESCRIPTION = "Task file for default GUI apps in the Pandora image" # Don't forget to bump the PR if you change it. -PR = "r6" +PR = "r1.4" inherit task RDEPENDS_${PN} = "\ - task-pandora-core \ - ${XSERVER} \ - angstrom-x11-base-depends \ - angstrom-gpe-task-base \ - angstrom-gpe-task-settings \ - abiword \ - claws-mail \ - evince \ - exhibit \ - epiphany firefox midori \ - swfdec-mozilla \ - omapfbplay \ - pidgin \ - synergy \ - vnc \ - x11vnc \ - xmms \ - xterm \ - xtscal \ - alsa-utils \ - alsa-utils-alsactl \ - alsa-utils-alsamixer \ - alsa-utils-aplay \ - pointercal \ - matchbox-wm \ - matchbox-keyboard matchbox-keyboard-applet matchbox-keyboard-im \ - matchbox-desktop \ - matchbox-common \ - matchbox-config-gtk \ - matchbox-themes-gtk \ - matchbox-panel-manager \ - matchbox-panel-hacks \ - ttf-liberation-sans ttf-liberation-serif ttf-liberation-mono \ - xauth xhost xset xrandr \ - xcursor-transparent-theme \ - settings-daemon \ - mplayer \ - omapfbplay \ - matchbox-applet-cards \ - matchbox-applet-inputmanager \ - matchbox-applet-volume \ - matchbox-applet-startup-monitor \ -# network-manager-applet \ + task-pandora-core \ + angstrom-x11-base-depends \ + angstrom-gpe-task-base angstrom-gpe-task-game angstrom-ohand-task-pim angstrom-gpe-task-apps angstrom-gpe-task-settings \ + angstrom-zeroconf-audio \ + angstrom-led-config \ + angstrom-gnome-icon-theme-enable \ + gpe-scap \ + xterm xmms \ + firefox midori \ + swfdec-mozilla \ + abiword \ + claws-mail \ + evince \ + exhibit \ + pidgin \ + gnome-games \ + synergy \ + vnc \ + x11vnc \ + xmms \ + xterm \ + xtscal \ + matchbox-wm \ + matchbox-keyboard matchbox-keyboard-applet matchbox-keyboard-im \ + matchbox-desktop \ + matchbox-common \ + matchbox-config-gtk \ + matchbox-themes-gtk \ + matchbox-panel-manager \ + matchbox-panel-hacks \ + ttf-liberation-sans ttf-liberation-serif ttf-liberation-mono \ + xauth xhost xset xrandr \ + xcursor-transparent-theme \ + settings-daemon \ + matchbox-applet-cards \ + matchbox-applet-inputmanager \ + matchbox-applet-volume \ + matchbox-applet-startup-monitor \ + connman-gnome \ +# networkmanager-applet \ + scummvm \ " diff --git a/packages/tasks/task-pandora-satogui.bb b/packages/tasks/task-pandora-satogui.bb index b6d1054..0ac1b4a 100755 --- a/packages/tasks/task-pandora-satogui.bb +++ b/packages/tasks/task-pandora-satogui.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Task file for default GUI apps in the Pandora image" # Don't forget to bump the PR if you change it. -PR = "r6" +PR = "r1.1" inherit task