From a8b3f3739bc7c81908b334bf801ab0171c9d0063 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 21 Mar 2009 12:34:43 +0100 Subject: libproxy: add libxmu to depends --- recipes/gnome/libproxy_0.2.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/gnome/libproxy_0.2.3.bb b/recipes/gnome/libproxy_0.2.3.bb index 2a2ee51cd7..c04be6b5f3 100644 --- a/recipes/gnome/libproxy_0.2.3.bb +++ b/recipes/gnome/libproxy_0.2.3.bb @@ -1,6 +1,6 @@ DESCRIPTION = "A library handling all the details of proxy configuration" LICENSE = "LGPL" -DEPENDS = "gconf virtual/libx11" +DEPENDS = "libxmu gconf virtual/libx11" SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz" -- cgit v1.2.3 From e5282534d15fd26725d4b1431989c1ee801f559c Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Fri, 20 Mar 2009 20:18:48 +0100 Subject: motorola-ezx-base.inc: set MACHINE_CLASS for overrides --- conf/machine/include/motorola-ezx-base.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc index fe28a3cb4d..75c0f42f7d 100644 --- a/conf/machine/include/motorola-ezx-base.inc +++ b/conf/machine/include/motorola-ezx-base.inc @@ -18,6 +18,9 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_PPI = "180" +# use this for overrides +MACHINE_CLASS = "motorola-ezx" + XSERVER = "xserver-kdrive-fbdev" ROOT_FLASH_SIZE = "24" -- cgit v1.2.3 From d13974119e39de08b0b2da9d4971dc9f3a289368 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Fri, 20 Mar 2009 20:27:27 +0100 Subject: frameworkd: bump to current HEAD; add configuration for htc-msm7 MACHINE_CLASS and motorola-ezx MACHINE_CLAS --- conf/distro/include/sane-srcrevs.inc | 2 +- .../freesmartphone/frameworkd/a780/frameworkd.conf | 22 --- .../frameworkd/htc-msm7/frameworkd.conf | 152 +++++++++++++++++++++ .../frameworkd/motorola-ezx/frameworkd.conf | 22 +++ recipes/freesmartphone/frameworkd_git.bb | 2 +- recipes/freesmartphone/fsodeviced_git.bb | 4 +- 6 files changed, 177 insertions(+), 27 deletions(-) delete mode 100644 recipes/freesmartphone/frameworkd/a780/frameworkd.conf create mode 100644 recipes/freesmartphone/frameworkd/htc-msm7/frameworkd.conf create mode 100644 recipes/freesmartphone/frameworkd/motorola-ezx/frameworkd.conf diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 87e9204e45..4e1a1cfcff 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -53,7 +53,7 @@ SRCREV_pn-epiphany ?= "7837" SRCREV_pn-etk-theme-ninja ?= "5" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-flashrom ?= "3682" -SRCREV_pn-frameworkd ?= "b652f9cc4efbccc1df941c0d93e156631879f174" +SRCREV_pn-frameworkd ?= "1b57e0a6bab423f4f74c0107b4bb9bd83733ee42" SRCREV_pn-frameworkd-devel ?= "858c8d58d1f7e807f2c09532787c4e7b1a5daa52" SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136" SRCREV_pn-fso-abyss ?= "6ed342f833930474ac506cbaad705c0d8beaa71f" diff --git a/recipes/freesmartphone/frameworkd/a780/frameworkd.conf b/recipes/freesmartphone/frameworkd/a780/frameworkd.conf deleted file mode 100644 index 36359a9f34..0000000000 --- a/recipes/freesmartphone/frameworkd/a780/frameworkd.conf +++ /dev/null @@ -1,22 +0,0 @@ -[frameworkd] -version = 1 -log_level = DEBUG -log_to = syslog - -[input] -# keys (copied from Openmoko, need to adjust) -report1 = AUX,key,169,1 -report2 = POWER,key,116,1 -report3 = USB,key,356,0 -report4 = HEADSET,switch,2,0 - -[ogsmd] -# A780 has Freescale Neptune LTE -modemtype = freescale_neptune - -[opreferencesd] -rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences - -[oeventsd] -rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml - diff --git a/recipes/freesmartphone/frameworkd/htc-msm7/frameworkd.conf b/recipes/freesmartphone/frameworkd/htc-msm7/frameworkd.conf new file mode 100644 index 0000000000..a50172c7f5 --- /dev/null +++ b/recipes/freesmartphone/frameworkd/htc-msm7/frameworkd.conf @@ -0,0 +1,152 @@ +[frameworkd] +# indicates this configuration version, do not change +version = 1 +# the default log_level, if not specified per module +log_level = INFO +# the global log_destination. Uncomment to enable +log_to = stderr +#log_to = file +#log_to = syslog +# if logging to a file, specify the destination +log_destination = /tmp/frameworkd.log +# persistance format, one of "pickle", "yaml" +persist_format = pickle +rootdir = ../etc/freesmartphone:/etc/freesmartphone:/usr/etc/freesmartphone +# specify how subsystems scan for their plugins, +# either "auto" (via filesystem scan) or "config" (via config section check) +# the default is "auto" (slow). +scantype = auto + +# +# Subsystem configuration for oeventsd +# +[odeviced] +# set log level for a subsystem or for an individual module +# available log levels are: DEBUG, INFO, WARNING, ERROR, CRITICAL +log_level = INFO + +[odeviced.accelerometer] +disable = 1 + +[odeviced.audio] +# set directory where the alsa audio scenarios are stored +scenario_dir = /usr/share/openmoko/scenarios +# set default scenario loaded at startup +default_scenario = stereoout + +[odeviced.idlenotifier] +# configure timeouts (in seconds) here. A value of 0 +# means 'never fall into this state' (except programatically) +idle = 10 +idle_dim = 20 +idle_prelock = 12 +lock = 2 +suspend = 2 + +[odeviced.input] +# format is ,,, +report1 = AUX,key,169,1 +report2 = POWER,key,116,1 +report3 = CHARGER,key,356,0 +report4 = HEADSET,switch,2,0 + +[odeviced.kernel26] +# set 1 to disable a module +disable = 0 +# poll capacity once every 5 minutes +# (usually, you do not have to change this) +capacity_check_timeout = 300 +# set 0 to disable FB_BLANK ioctl to blank framebuffer +# (if you have problems on Openmoko GTA02) +fb_blank = 1 + +[odeviced.powercontrol_ibm] +disable = 1 + +[odeviced.powercontrol_neo] +disable = 1 + +# +# Subsystem configuration for oeventsd +# +[oeventsd] +log_level = DEBUG +disable = 0 + +[oeventsd.oevents] + +# +# Subsystem configuration for ogspd +# +[ogpsd] +# possible options are NMEADevice, UBXDevice, GTA02Device, EtenDevice +device = GTA02Device +# possible options are SerialChannel, GllinChannel, UDPChannel, FileChannel +channel = SerialChannel +# For UDPChannel the path defines the port to listen to +path = /dev/ttySAC1 +log_level = INFO + +[ogpsd.factory] + +# +# Subsystem configuration for ogsmd +# +[ogsmd] +disable = 0 +modemtype = qualcomm_msm + +# +# Subsystem configuration for onetworkd +# +[onetworkd] + +[onetworkd.network] + +# +# Subsystem configuration for ophoned +# +[ophoned] + +[ophoned.ophoned] + +# +# Subsystem configuration for opimd +# +[opimd] +contacts_default_backend = CSV-Contacts +messages_default_folder = Unfiled +messages_trash_folder = Trash +sim_messages_default_folder = SMS +rootdir = ../etc/freesmartphone/opim:/etc/freesmartphone/opim:/usr/etc/freesmartphone/opim + +[opimd.opimd] + +# +# Subsystem configuration for opreferencesd +# +[opreferencesd] +log_level = DEBUG +disable = 0 +# log_level = DEBUG + +[opreferencesd.opreferences] + +# +# Subsystem configuration for otimed +# +[otimed] +# a list of time/zone sources to use or NONE +timesources = GPS,NTP +zonesources = GSM + +[otimed.otimed] + +# +# Subsystem configuration for ousaged +# +[ousaged] +# choose whether resources should be disabled at startup, at shutdown, always (default), or never. +sync_resources_with_lifecycle = always + +[ousaged.generic] diff --git a/recipes/freesmartphone/frameworkd/motorola-ezx/frameworkd.conf b/recipes/freesmartphone/frameworkd/motorola-ezx/frameworkd.conf new file mode 100644 index 0000000000..36359a9f34 --- /dev/null +++ b/recipes/freesmartphone/frameworkd/motorola-ezx/frameworkd.conf @@ -0,0 +1,22 @@ +[frameworkd] +version = 1 +log_level = DEBUG +log_to = syslog + +[input] +# keys (copied from Openmoko, need to adjust) +report1 = AUX,key,169,1 +report2 = POWER,key,116,1 +report3 = USB,key,356,0 +report4 = HEADSET,switch,2,0 + +[ogsmd] +# A780 has Freescale Neptune LTE +modemtype = freescale_neptune + +[opreferencesd] +rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences + +[oeventsd] +rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml + diff --git a/recipes/freesmartphone/frameworkd_git.bb b/recipes/freesmartphone/frameworkd_git.bb index 14aa183d94..d658fd092a 100644 --- a/recipes/freesmartphone/frameworkd_git.bb +++ b/recipes/freesmartphone/frameworkd_git.bb @@ -4,7 +4,7 @@ AUTHOR = "FreeSmartphone.Org Development Team" SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" -PV = "0.8.5.1+gitr${SRCREV}" +PV = "0.8.5.2+gitr${SRCREV}" PR = "r0" inherit distutils update-rc.d diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb index e8a77fd617..4cb61c7c29 100644 --- a/recipes/freesmartphone/fsodeviced_git.bb +++ b/recipes/freesmartphone/fsodeviced_git.bb @@ -10,6 +10,4 @@ SRC_URI = "\ " S = "${WORKDIR}/git/fsodeviced" -inherit autotools - -FILES_${PN} += "${datadir}" +inherit autotools fso-plugin vala -- cgit v1.2.3 From 5cf0c9a4d369f2b8c3cc959c3d09c222b4a16fde Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sat, 21 Mar 2009 02:33:51 +0100 Subject: libeflvala: new recipe; Vala bindings for the Enlightenment Foundation Libraries --- conf/distro/include/sane-srcrevs.inc | 3 ++- recipes/freesmartphone/libeflvala_git.bb | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 recipes/freesmartphone/libeflvala_git.bb diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 4e1a1cfcff..9eb5477401 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -78,6 +78,7 @@ SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181b SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" SRCREV_pn-libcalenabler2 ?= "1410" +SRCREV_pn-libeflvala ?= "f34ef380ce5c789745b249d96c3f1b7aa04fbd45" SRCREV_pn-libefso ?= "60" SRCREV_pn-libexalt ?= "78" SRCREV_pn-libexalt-dbus ?= "76" @@ -244,7 +245,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "39263" +EFL_SRCREV ?= "39502" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eina-native ?= "${EFL_SRCREV}" diff --git a/recipes/freesmartphone/libeflvala_git.bb b/recipes/freesmartphone/libeflvala_git.bb new file mode 100644 index 0000000000..f35c6c6187 --- /dev/null +++ b/recipes/freesmartphone/libeflvala_git.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Vala meets the Enlightenment Foundation Libraries" +AUTHOR = "Michael 'Mickey' Lauer " +LICENSE = "LGPL" +SECTION = "devel" +DEPENDS = "vala-native glib-2.0 dbus dbus-glib eina eet evas ecore edje elementary" +PV = "0.0.0.0+gitr${SRCREV}" +PR = "r0" + +SRC_URI = "${FREESMARTPHONE_GIT}/libeflvala;protocol=git;branch=master" +S = "${WORKDIR}/git" + +inherit autotools_stage pkgconfig vala + +PACKAGES =+ "${PN}-examples" +FILES_${PN}-examples = "${datadir}/libeflvala ${bindir}" + -- cgit v1.2.3 From 1e710c6246b4680800e1a266248d2b39be9a323e Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sat, 21 Mar 2009 02:34:31 +0100 Subject: minimal.conf: override OVERRIDES to include the MACHINE_CLASS --- conf/distro/minimal.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index 56724446cf..35c3368451 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -73,6 +73,11 @@ MACHINE_KERNEL_VERSION = "2.6" PREFERRED_LIBC = "glibc" require conf/distro/include/sane-toolchain.inc +############################################################################# +# OVERWRITES adjusted from bitbake.conf to feature the MACHINE_CLASS +############################################################################# +OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" + ############################################################################# # PREFERRED PROVIDERS ############################################################################# -- cgit v1.2.3 From 5163515a66c90b3988be0a1159107bfc569aca4c Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sat, 21 Mar 2009 13:20:38 +0100 Subject: linux-msm7xxx: enable NFS and CIFS for htcraphael --- recipes/linux/linux-msm7xxxx/htcraphael/defconfig | 61 ++++++++++++++++++----- recipes/linux/linux-msm7xxxx_git.bb | 2 +- 2 files changed, 50 insertions(+), 13 deletions(-) diff --git a/recipes/linux/linux-msm7xxxx/htcraphael/defconfig b/recipes/linux/linux-msm7xxxx/htcraphael/defconfig index 64a6044a8d..22d8fe93dc 100644 --- a/recipes/linux/linux-msm7xxxx/htcraphael/defconfig +++ b/recipes/linux/linux-msm7xxxx/htcraphael/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.27 -# Wed Feb 25 00:43:45 2009 +# Thu Mar 19 20:02:34 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -201,6 +201,7 @@ CONFIG_MACH_HTCRAPHAEL=y CONFIG_MACH_HTCRAPHAEL_CDMA=y CONFIG_MACH_HTCDIAMOND=y CONFIG_MACH_HTCDIAMOND_CDMA=y +# CONFIG_MACH_HTCBLACKSTONE is not set # CONFIG_TROUT_H2W is not set # CONFIG_TROUT_PWRSINK is not set CONFIG_MSM7X00A_USE_GP_TIMER=y @@ -226,6 +227,7 @@ CONFIG_MSM_IDLE_STATS_BUCKET_COUNT=10 CONFIG_MSM_FIQ_SUPPORT=y # CONFIG_MSM_SERIAL_DEBUGGER is not set CONFIG_MSM_SMD=y +# CONFIG_MSM_SMD_7500 is not set # CONFIG_MSM_ONCRPCROUTER is not set # CONFIG_MSM_CPU_FREQ_ONDEMAND is not set # CONFIG_MSM_CPU_FREQ_SCREEN is not set @@ -303,7 +305,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=76M console=ttyMSM2,115200n8" +CONFIG_CMDLINE=" debug " # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set @@ -570,6 +572,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI=y # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set CONFIG_TOUCHSCREEN_MSM=y # CONFIG_MSM_VIRTUAL_KEYBOARD is not set +# CONFIG_MSM_BLACKSTONE_PAD is not set CONFIG_INPUT_MISC=y # CONFIG_INPUT_ATI_REMOTE is not set # CONFIG_INPUT_ATI_REMOTE2 is not set @@ -769,11 +772,7 @@ CONFIG_FONT_8x8=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -# CONFIG_LOGO_LINUX_CLUT224 is not set -CONFIG_LOGO_DIAMRAPH_CLUT224=y +# CONFIG_LOGO is not set # CONFIG_SOUND is not set CONFIG_HID_SUPPORT=y CONFIG_HID=y @@ -926,7 +925,7 @@ CONFIG_JBD=y CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set -# CONFIG_FS_POSIX_ACL is not set +CONFIG_FS_POSIX_ACL=y # CONFIG_XFS_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_DNOTIFY is not set @@ -984,10 +983,32 @@ CONFIG_TMPFS=y # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y -# CONFIG_NFS_FS is not set -# CONFIG_NFSD is not set +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +# CONFIG_NFS_V4 is not set +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +# CONFIG_NFSD_V4 is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_ACL_SUPPORT=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set -# CONFIG_CIFS is not set +CONFIG_CIFS=y +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -995,8 +1016,24 @@ CONFIG_NETWORK_FILESYSTEMS=y # # Partition Types # -# CONFIG_PARTITION_ADVANCED is not set +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=y diff --git a/recipes/linux/linux-msm7xxxx_git.bb b/recipes/linux/linux-msm7xxxx_git.bb index d4571d1d97..4751c99876 100644 --- a/recipes/linux/linux-msm7xxxx_git.bb +++ b/recipes/linux/linux-msm7xxxx_git.bb @@ -3,7 +3,7 @@ require linux.inc PV = "2.6.25+${PR}+gitr${SRCREV}" PV_htcraphael = "2.6.27+${PR}+gitr${SRCREV}" PV_htcdiamond = "2.6.27+${PR}+gitr${SRCREV}" -PR = "r4" +PR = "r6" COMPATIBLE_MACHINE = "htckaiser|htcpolaris|htcvogue|htctitan|htcnike|htcraphael|htcdiamond|htcblackstone" -- cgit v1.2.3 From 99d25764dbf459815086acc6182d391a9fd94701 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 21 Mar 2009 12:03:59 -0500 Subject: ffmpeg: don't forget to stage pixfmt.h, and bump PRs of affected recipes. --- recipes/ffmpeg/ffmpeg.inc | 2 +- recipes/ffmpeg/ffmpeg_0.5.bb | 2 +- recipes/ffmpeg/ffmpeg_git.bb | 2 +- recipes/ffmpeg/ffmpeg_svn.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc index 33e7d7aaf7..3f93765e45 100644 --- a/recipes/ffmpeg/ffmpeg.inc +++ b/recipes/ffmpeg/ffmpeg.inc @@ -53,7 +53,7 @@ do_stage() { for h in adler32.h avstring.h avutil.h base64.h bswap.h \ common.h crc.h fifo.h integer.h intfloat_readwrite.h \ - log.h lzo.h mathematics.h md5.h mem.h random.h \ + log.h lzo.h mathematics.h md5.h mem.h pixfmt.h random.h \ rational.h sha1.h do install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/ffmpeg/$h diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb index e49478a215..698f45c83b 100644 --- a/recipes/ffmpeg/ffmpeg_0.5.bb +++ b/recipes/ffmpeg/ffmpeg_0.5.bb @@ -3,7 +3,7 @@ require ffmpeg.inc DEPENDS += "schroedinger libgsm" PE = "1" -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "1" diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb index b2b854aed8..fa82fb2044 100644 --- a/recipes/ffmpeg/ffmpeg_git.bb +++ b/recipes/ffmpeg/ffmpeg_git.bb @@ -4,7 +4,7 @@ DEPENDS += "schroedinger libgsm" PE = "1" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r38" +PR = "r39" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_arm = "1" diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb index 5d8c775e93..c7aaa7127c 100644 --- a/recipes/ffmpeg/ffmpeg_svn.bb +++ b/recipes/ffmpeg/ffmpeg_svn.bb @@ -6,7 +6,7 @@ SRCREV = "16396" PE = "1" PV = "0.4.9+svnr${SRCREV}" -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From c170ace0455882aa04960291d78fcdba6d69318d Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 26 Feb 2009 14:21:32 -0800 Subject: automake-native: use require, not include. Signed-off-by: Chris Larson --- recipes/automake/automake-native.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/automake/automake-native.inc b/recipes/automake/automake-native.inc index 7b69252ff0..5ced30d5df 100644 --- a/recipes/automake/automake-native.inc +++ b/recipes/automake/automake-native.inc @@ -1,5 +1,5 @@ SECTION = "devel" -include automake_${PV}.bb +require automake_${PV}.bb DEPENDS = "autoconf-native" RDEPENDS_automake-native = "autoconf-native perl-native-runtime" -- cgit v1.2.3 From 8269e0572c5e27fdf6fd166866b7b3c02fe03ac9 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 26 Feb 2009 15:18:18 -0800 Subject: omext: Unbork the S variable. Signed-off-by: Chris Larson --- recipes/openmoko-3rdparty/omext_0.2.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipes/openmoko-3rdparty/omext_0.2.bb b/recipes/openmoko-3rdparty/omext_0.2.bb index 203b84e3df..96f7ff51f6 100644 --- a/recipes/openmoko-3rdparty/omext_0.2.bb +++ b/recipes/openmoko-3rdparty/omext_0.2.bb @@ -7,6 +7,4 @@ SRC_URI = "http://www.devzero.net/openmoko/dist/omext-${PV}.tar.gz" inherit autotools pkgconfig -S = "{WORKDIR}/openmoko-extensionhandler" - - +S = "${WORKDIR}/openmoko-extensionhandler" -- cgit v1.2.3 From 7a4eb52b1f2f74481982797732b08a6e19841b3d Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 26 Feb 2009 15:19:03 -0800 Subject: bzip2-full-native: Kill the manual copy of install-sh, autoreconf will handle that. Signed-off-by: Chris Larson --- recipes/bzip2/bzip2-full-native_1.0.5.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/bzip2/bzip2-full-native_1.0.5.bb b/recipes/bzip2/bzip2-full-native_1.0.5.bb index 13bebbb3d5..53e0c112cc 100644 --- a/recipes/bzip2/bzip2-full-native_1.0.5.bb +++ b/recipes/bzip2/bzip2-full-native_1.0.5.bb @@ -16,7 +16,6 @@ inherit autotools native do_configure_prepend () { cp ${WORKDIR}/configure.ac ${S}/ cp ${WORKDIR}/Makefile.am ${S}/ - cp ${STAGING_DATADIR_NATIVE}/automake*/install-sh ${S}/ } do_stage () { -- cgit v1.2.3 From cb58267771bdf8b248485ed1c7ed14880343dfd9 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 26 Feb 2009 15:28:47 -0800 Subject: console-tools: clean up the way it handles its .m4 files Signed-off-by: Chris Larson --- recipes/console-tools/console-tools_0.3.2.bb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/recipes/console-tools/console-tools_0.3.2.bb b/recipes/console-tools/console-tools_0.3.2.bb index 9e48c2c572..46c8a28ffc 100644 --- a/recipes/console-tools/console-tools_0.3.2.bb +++ b/recipes/console-tools/console-tools_0.3.2.bb @@ -9,17 +9,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \ file://compile.patch;patch=1 \ file://kbdrate.patch;patch=1 \ file://uclibc-fileno.patch;patch=1 \ - file://config/*.m4" + file://config" export SUBDIRS = "fontfiletools vttools kbdtools screenfonttools contrib \ examples po intl compat" -acpaths = "-I config" -do_configure_prepend () { - mkdir -p config - cp ${WORKDIR}/config/*.m4 config/ -} - do_compile () { oe_runmake -C lib oe_runmake 'SUBDIRS=${SUBDIRS}' @@ -27,6 +21,8 @@ do_compile () { inherit autotools +acpaths = "-I ${WORKDIR}/config" + do_install () { autotools_do_install mv ${D}${bindir}/chvt ${D}${bindir}/chvt.${PN} -- cgit v1.2.3 From ecfad70aae36a382459e53c9a16c82e9604d4421 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 19 Feb 2009 15:51:57 -0700 Subject: bitbake.conf: rework FILESPATH generation. Rework FILESPATH generation to be done in bitbake.conf, avoiding the confusion about it being in multiple places. Adds FILESPATHBASE and FILESPATHPKG which can be manipulated rather than manipulating FILESPATH directly. One usage possibility: FILESPATHBASE =. "${TOPDIR}/files:" Which would let me provide a custom busybox config for this build by copying the defconfig from the openembedded metadata into my build/files/busybox-1.0/ directory, for example. Signed-off-by: Chris Larson --- classes/base.bbclass | 12 ------------ conf/bitbake.conf | 6 ++++-- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index f1fee83a14..1b61895b07 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -180,18 +180,6 @@ def base_package_name(d): return pn -def base_set_filespath(path, d): - import os, bb - filespath = [] - # The ":" ensures we have an 'empty' override - overrides = (bb.data.getVar("OVERRIDES", d, 1) or "") + ":" - for p in path: - for o in overrides.split(":"): - filespath.append(os.path.join(p, o)) - return ":".join(filespath) - -FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/${BP}", "${FILE_DIRNAME}/${BPN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ], d)}" - def oe_filter(f, str, d): from re import match return " ".join(filter(lambda x: match(f, x, 0), str.split())) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 68301bc478..7954b8deec 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -231,9 +231,11 @@ FILES_${PN}-locale = "${datadir}/locale" export MANIFEST = "${FILESDIR}/manifest" +# file:// search paths FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}" -FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/${BP}:${FILE_DIRNAME}/${BPN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" -FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}" +FILESPATHBASE = "${FILE_DIRNAME}" +FILESPATHPKG = "${PF}:${P}:${PN}:${BP}:${BPN}:files:." +FILESPATH = "${@':'.join(['%s/%s/%s' % (fp, p, o) for fp in d.getVar('FILESPATHBASE', 0).split(':') for p in d.getVar('FILESPATHPKG', 0).split(':') for o in (d.getVar('OVERRIDES', 0) + ':.').split(':')])}:${FILESDIR}" ################################################################## # General work and output directories for the build system. -- cgit v1.2.3 From 515fc2744996506d8394f90dfe237175e51dc441 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 25 Feb 2009 14:12:24 -0800 Subject: base.bbclass: Kill the 'Pkg' messages in the event handler. Now that bitbake operates at a task level, not a package level, the package messages are, at best, useless, and at worst, confusing for the user. Signed-off-by: Chris Larson --- classes/base.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 1b61895b07..d386d89a71 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -856,10 +856,7 @@ python base_eventhandler() { name = getName(e) msg = "" - if name.startswith("Pkg"): - msg += "package %s: " % data.getVar("P", e.data, 1) - msg += messages.get(name[3:]) or name[3:] - elif name.startswith("Task"): + if name.startswith("Task"): msg += "package %s: task %s: " % (data.getVar("PF", e.data, 1), e.task) msg += messages.get(name[4:]) or name[4:] elif name.startswith("Build"): @@ -867,6 +864,8 @@ python base_eventhandler() { msg += messages.get(name[5:]) or name[5:] elif name == "UnsatisfiedDep": msg += "package %s: dependency %s %s" % (e.pkg, e.dep, name[:-3].lower()) + else: + return NotHandled # Only need to output when using 1.8 or lower, the UI code handles it # otherwise -- cgit v1.2.3 From 65530068f30a5eea3db1b7da0e85d8e23d1dce00 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 25 Feb 2009 15:05:41 -0800 Subject: classes/base.bbclass: Locate the scm base path via BBPATH. Currently, if the first item in BBFILES isn't in the main OE repository, the build fails entirely due to a ValueError. This isn't optimal. Rather than searching through BBFILES to find it, which could be slow when BBFILES contains thousands of files, let's just find base.bbclass and use that repository. Also, use better methods to find the git revision and branch, and identify the scm based on the existance of .svn/.git/_MTN to avoid calling out subprocesses unnecessarily. Signed-off-by: Chris Larson --- classes/base.bbclass | 87 +++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 45 deletions(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index d386d89a71..cf4b5c5e1d 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -758,21 +758,45 @@ python base_do_unpack() { raise bb.build.FuncFailed() } -def base_get_scmbasepath(d): - import bb - path_to_bbfiles = bb.data.getVar( 'BBFILES', d, 1 ).split() +METADATA_SCM = "${@base_get_scm(d)}" +METADATA_REVISION = "${@base_get_scm_revision(d)}" +METADATA_BRANCH = "${@base_get_scm_branch(d)}" +def base_get_scm(d): + import os + from bb import which + baserepo = os.path.dirname(os.path.dirname(which(d.getVar("BBPATH", 1), "classes/base.bbclass"))) + for (scm, scmpath) in {"svn": ".svn", + "git": ".git", + "monotone": "_MTN"}.iteritems(): + if os.path.exists(os.path.join(baserepo, scmpath)): + return "%s %s" % (scm, baserepo) + return " %s" % baserepo + +def base_get_scm_revision(d): + (scm, path) = d.getVar("METADATA_SCM", 1).split() try: - index = path_to_bbfiles[0].rindex( "recipes" ) - except ValueError: - index = path_to_bbfiles[0].rindex( "packages" ) + if scm != "": + return globals()["base_get_metadata_%s_revision" % scm](path, d) + else: + return scm + except KeyError: + return "" - return path_to_bbfiles[0][:index] +def base_get_scm_branch(d): + (scm, path) = d.getVar("METADATA_SCM", 1).split() + try: + if scm != "": + return globals()["base_get_metadata_%s_branch" % scm](path, d) + else: + return scm + except KeyError: + return "" -def base_get_metadata_monotone_branch(d): +def base_get_metadata_monotone_branch(path, d): monotone_branch = "" try: - monotone_branch = file( "%s/_MTN/options" % base_get_scmbasepath(d) ).read().strip() + monotone_branch = file( "%s/_MTN/options" % path ).read().strip() if monotone_branch.startswith( "database" ): monotone_branch_words = monotone_branch.split() monotone_branch = monotone_branch_words[ monotone_branch_words.index( "branch" )+1][1:-1] @@ -780,10 +804,10 @@ def base_get_metadata_monotone_branch(d): pass return monotone_branch -def base_get_metadata_monotone_revision(d): +def base_get_metadata_monotone_revision(path, d): monotone_revision = "" try: - monotone_revision = file( "%s/_MTN/revision" % base_get_scmbasepath(d) ).read().strip() + monotone_revision = file( "%s/_MTN/revision" % path ).read().strip() if monotone_revision.startswith( "format_version" ): monotone_revision_words = monotone_revision.split() monotone_revision = monotone_revision_words[ monotone_revision_words.index( "old_revision" )+1][1:-1] @@ -791,56 +815,29 @@ def base_get_metadata_monotone_revision(d): pass return monotone_revision -def base_get_metadata_svn_revision(d): +def base_get_metadata_svn_revision(path, d): revision = "" try: - revision = file( "%s/.svn/entries" % base_get_scmbasepath(d) ).readlines()[3].strip() + revision = file( "%s/.svn/entries" % path ).readlines()[3].strip() except IOError: pass return revision -def base_get_metadata_git_branch(d): +def base_get_metadata_git_branch(path, d): import os - branch = os.popen('cd %s; git branch | grep "^* " | tr -d "* "' % base_get_scmbasepath(d)).read() + branch = os.popen('cd %s; git symbolic-ref HEAD' % path).read() if len(branch) != 0: - return branch + return branch.replace("refs/heads/", "") return "" -def base_get_metadata_git_revision(d): +def base_get_metadata_git_revision(path, d): import os - rev = os.popen("cd %s; git log -n 1 --pretty=oneline --" % base_get_scmbasepath(d)).read().split(" ")[0] + rev = os.popen("cd %s; git show-ref HEAD" % path).read().split(" ")[0] if len(rev) != 0: return rev return "" -def base_detect_revision(d): - scms = [base_get_metadata_monotone_revision, \ - base_get_metadata_svn_revision, \ - base_get_metadata_git_revision] - - for scm in scms: - rev = scm(d) - if rev <> "": - return rev - - return "" - -def base_detect_branch(d): - scms = [base_get_metadata_monotone_branch, \ - base_get_metadata_git_branch] - - for scm in scms: - rev = scm(d) - if rev <> "": - return rev.strip() - - return "" - - - -METADATA_BRANCH ?= "${@base_detect_branch(d)}" -METADATA_REVISION ?= "${@base_detect_revision(d)}" addhandler base_eventhandler python base_eventhandler() { -- cgit v1.2.3 From 630555abb7ed906d6cb4bedecc94c34db84328ea Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 26 Feb 2009 15:39:59 -0800 Subject: base.bbclass: make oe_unpack_file of dirs use FILESPATH, not FILESDIR. Signed-off-by: Chris Larson --- classes/base.bbclass | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index cf4b5c5e1d..caaa6b2da1 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -689,15 +689,18 @@ def oe_unpack_file(file, data, url = None): cmd = '%s -a' % cmd cmd = '%s %s' % (cmd, file) elif os.path.isdir(file): - filesdir = os.path.realpath(bb.data.getVar("FILESDIR", data, 1)) destdir = "." - if file[0:len(filesdir)] == filesdir: - destdir = file[len(filesdir):file.rfind('/')] - destdir = destdir.strip('/') - if len(destdir) < 1: - destdir = "." - elif not os.access("%s/%s" % (os.getcwd(), destdir), os.F_OK): - os.makedirs("%s/%s" % (os.getcwd(), destdir)) + filespath = bb.data.getVar("FILESPATH", data, 1).split(":") + for fp in filespath: + if file[0:len(fp)] == fp: + destdir = file[len(fp):file.rfind('/')] + destdir = destdir.strip('/') + if len(destdir) < 1: + destdir = "." + elif not os.access("%s/%s" % (os.getcwd(), destdir), os.F_OK): + os.makedirs("%s/%s" % (os.getcwd(), destdir)) + break + cmd = 'cp -pPR %s %s/%s/' % (file, os.getcwd(), destdir) else: (type, host, path, user, pswd, parm) = bb.decodeurl(url) -- cgit v1.2.3 From 114155243344c15847e73598e82d02926443cbf1 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Mon, 2 Mar 2009 08:13:31 -0800 Subject: cross.bbclass: set autoconf's program prefix to keep TARGET_SYS and TARGET_PREFIX decoupled Currently, we rely on autoconf's implicit prefixing of outputted binaries for -cross, but that names them based on TARGET_SYS, not TARGET_PREFIX, which keeps the two tightly coupled. By explicitly setting the prefix to the latter, we get around that. Signed-off-by: Chris Larson --- classes/cross.bbclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/classes/cross.bbclass b/classes/cross.bbclass index 7debde6669..72a0fb7851 100644 --- a/classes/cross.bbclass +++ b/classes/cross.bbclass @@ -2,6 +2,11 @@ # no need for them to be a direct target of 'world' EXCLUDE_FROM_WORLD = "1" +# In order to keep TARGET_PREFIX decoupled from TARGET_SYS, let's force the +# binary names to match the former, rather than relying on autoconf's implicit +# prefixing based on the latter. +EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" + # Save PACKAGE_ARCH before changing HOST_ARCH OLD_PACKAGE_ARCH := "${PACKAGE_ARCH}" PACKAGE_ARCH = "${OLD_PACKAGE_ARCH}" -- cgit v1.2.3 From 06e6fddcf04474cd1006ee8ad3e51c2c2dbfde2a Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 26 Feb 2009 14:31:29 -0800 Subject: bitbake.conf: Move the list of vars shown in the pre-build config display to here. Now a distro or machine can add their own variables to display. Signed-off-by: Chris Larson --- classes/base.bbclass | 4 ++-- conf/bitbake.conf | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index caaa6b2da1..11f6554d2d 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -875,12 +875,12 @@ python base_eventhandler() { if name.startswith("BuildStarted"): bb.data.setVar( 'BB_VERSION', bb.__version__, e.data ) - statusvars = ['BB_VERSION', 'METADATA_BRANCH', 'METADATA_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TARGET_FPU'] + statusvars = bb.data.getVar("BUILDCFG_VARS", e.data, 1).split() statuslines = ["%-17s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars] statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines) print statusmsg - needed_vars = [ "TARGET_ARCH", "TARGET_OS" ] + needed_vars = bb.data.getVar("BUILDCFG_NEEDEDVARS", e.data, 1).split() pesteruser = [] for v in needed_vars: val = bb.data.getVar(v, e.data, 1) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 7954b8deec..7a6f80f1e8 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -594,6 +594,12 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}" # Globally toggle certain dependencies ENTERPRISE_DISTRO ?= "0" +# Pre-build configuration output +BUILDCFG_VARS ?= "BB_VERSION METADATA_BRANCH METADATA_REVISION TARGET_ARCH TARGET_OS MACHINE DISTRO DISTRO_VERSION" +BUILDCFG_VARS_append_arm = " TARGET_FPU" +BUILDCFG_VARS_append_armeb = " TARGET_FPU" +BUILDCFG_NEEDEDVARS ?= "TARGET_ARCH TARGET_OS" + ### ### Config file processing ### -- cgit v1.2.3 From 99146d8043a5aed5d0d09fa9dad5271cffdd8f5d Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 20 Mar 2009 18:21:38 -0700 Subject: insane.bbclass: Silence the annoying GNU_HASH QA checks when --hash-style isn't set. Signed-off-by: Chris Larson --- classes/insane.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 5b31a0123d..48964afb92 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -343,6 +343,8 @@ def package_qa_hash_style(path, name, d, elf): gnu_hash = "--hash-style=gnu" in bb.data.getVar('LDFLAGS', d, True) if not gnu_hash: gnu_hash = "--hash-style=both" in bb.data.getVar('LDFLAGS', d, True) + if not gnu_hash: + return True objdump = bb.data.getVar('OBJDUMP', d, True) env_path = bb.data.getVar('PATH', d, True) -- cgit v1.2.3 From cca2065fe51746581e17a0dce3acab9a91196fc6 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 18 Mar 2009 11:56:30 -0700 Subject: bitbake.conf: Make FILESPATH only contain directories that actually exist. Signed-off-by: Chris Larson --- conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 7a6f80f1e8..2fb6b90e1a 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -235,7 +235,7 @@ export MANIFEST = "${FILESDIR}/manifest" FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}" FILESPATHBASE = "${FILE_DIRNAME}" FILESPATHPKG = "${PF}:${P}:${PN}:${BP}:${BPN}:files:." -FILESPATH = "${@':'.join(['%s/%s/%s' % (fp, p, o) for fp in d.getVar('FILESPATHBASE', 0).split(':') for p in d.getVar('FILESPATHPKG', 0).split(':') for o in (d.getVar('OVERRIDES', 0) + ':.').split(':')])}:${FILESDIR}" +FILESPATH = "${@':'.join([os.path.normpath(os.path.join(fp, p, o)) for fp in d.getVar('FILESPATHBASE', 1).split(':') for p in d.getVar('FILESPATHPKG', 1).split(':') for o in (d.getVar('OVERRIDES', 1) + ':').split(':') if os.path.exists(os.path.join(fp, p, o))])}:${FILESDIR}" ################################################################## # General work and output directories for the build system. -- cgit v1.2.3 From 4cd7e03d78aed8ee6f3bd18d569a0ee9b2587633 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 13 Mar 2009 13:35:56 -0700 Subject: base.bbclass: Add base_path_relative. base_path_relative returns a relative path from src to dest. Examples: >>> base_path_relative("/usr/bin", "/tmp/foo/bar") ../../tmp/foo/bar >>> base_path_relative("/usr/bin", "/usr/lib") ../lib >>> base_path_relative("/tmp", "/tmp/foo/bar") foo/bar Signed-off-by: Chris Larson --- classes/base.bbclass | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/classes/base.bbclass b/classes/base.bbclass index 11f6554d2d..9bcd2abb3c 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -10,6 +10,35 @@ def base_path_join(a, *p): path += '/' + b return path +def base_path_relative(src, dest): + """ Return a relative path from src to dest. + + >>> base_path_relative("/usr/bin", "/tmp/foo/bar") + ../../tmp/foo/bar + + >>> base_path_relative("/usr/bin", "/usr/lib") + ../lib + + >>> base_path_relative("/tmp", "/tmp/foo/bar") + foo/bar + """ + from os.path import sep, pardir, normpath, commonprefix + + destlist = normpath(dest).split(sep) + srclist = normpath(src).split(sep) + + # Find common section of the path + common = commonprefix([destlist, srclist]) + commonlen = len(common) + + # Climb back to the point where they differentiate + relpath = [ pardir ] * (len(srclist) - commonlen) + if commonlen < len(destlist): + # Add remaining portion + relpath += destlist[commonlen:] + + return sep.join(relpath) + # for MD5/SHA handling def base_chk_load_parser(config_path): import ConfigParser, os, bb -- cgit v1.2.3 From 2652dfa9fb6da4423f9d556aaa289ac6fc198fe5 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 5 Mar 2009 07:52:34 -0800 Subject: bitbake.conf: make cvs and wget fetching obey PATH from the metadata. This is a workaround. The cvs and wget fetchers should be modified to use the runfetchcmd method, which lets certain metadata variables through when executing the fetch commands. Signed-off-by: Chris Larson --- conf/bitbake.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 2fb6b90e1a..d8635e8ea7 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -517,13 +517,13 @@ FETCHCMD_bzr = "/usr/bin/env bzr" FETCHCMD_hg = "/usr/bin/env hg" FETCHCOMMAND = "ERROR, this must be a BitBake bug" -FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} ${URI}" -FETCHCOMMAND_cvs = "/usr/bin/env cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}" +FETCHCOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} ${URI}" +FETCHCOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}" FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}" RESUMECOMMAND = "ERROR, this must be a BitBake bug" -RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P --no-check-certificate ${DL_DIR} ${URI}" +RESUMECOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -c -t 5 --passive-ftp -P --no-check-certificate ${DL_DIR} ${URI}" UPDATECOMMAND = "ERROR, this must be a BitBake bug" -UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}" +UPDATECOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}" UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}" SRCDATE = "${DATE}" SRCREV = "1" -- cgit v1.2.3 From f3a6785d8a91e1f1763f48a5981f7e2a8d37f151 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sat, 21 Mar 2009 21:34:03 -0700 Subject: base.bbclass: revert removal of base_set_filespath until the refs can be removed. Also added a deprecation message to it. Signed-off-by: Chris Larson --- classes/base.bbclass | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/classes/base.bbclass b/classes/base.bbclass index 9bcd2abb3c..952952b7fe 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -209,6 +209,17 @@ def base_package_name(d): return pn +def base_set_filespath(path, d): + import os, bb + bb.note("base_set_filespath usage is deprecated, %s should be fixed" % d.getar("P", 1)) + filespath = [] + # The ":" ensures we have an 'empty' override + overrides = (bb.data.getVar("OVERRIDES", d, 1) or "") + ":" + for p in path: + for o in overrides.split(":"): + filespath.append(os.path.join(p, o)) + return ":".join(filespath) + def oe_filter(f, str, d): from re import match return " ".join(filter(lambda x: match(f, x, 0), str.split())) -- cgit v1.2.3 From d9a3e7e7679f0ebd11c11f5a96c19b4137fb4ec0 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sat, 21 Mar 2009 22:11:46 -0700 Subject: base.bbclass: Fix typo. Signed-off-by: Chris Larson --- classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 952952b7fe..f39059ecc0 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -211,7 +211,7 @@ def base_package_name(d): def base_set_filespath(path, d): import os, bb - bb.note("base_set_filespath usage is deprecated, %s should be fixed" % d.getar("P", 1)) + bb.note("base_set_filespath usage is deprecated, %s should be fixed" % d.getVar("P", 1)) filespath = [] # The ":" ensures we have an 'empty' override overrides = (bb.data.getVar("OVERRIDES", d, 1) or "") + ":" -- cgit v1.2.3 From d817e1703eae7dc906de8ddd1d4a4dec38609d78 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 21 Mar 2009 17:12:10 -0500 Subject: SlugOS: preferred_slugos_versions.inc - bump up libtool and remove restrictions caused by the older libtool. --- conf/distro/include/preferred-slugos-versions.inc | 31 +++-------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc index ac2250feaa..e36d4cdb44 100644 --- a/conf/distro/include/preferred-slugos-versions.inc +++ b/conf/distro/include/preferred-slugos-versions.inc @@ -48,10 +48,10 @@ PREFERRED_VERSION_glibc ?= "2.6.1" PREFERRED_VERSION_glibc-initial ?= "2.6.1" PREFERRED_VERSION_ipkg ?= "0.99.163" PREFERRED_VERSION_ipkg-native ?= "0.99.163" -PREFERRED_VERSION_libtool ?= "1.5.10" -PREFERRED_VERSION_libtool-native ?= "1.5.10" -PREFERRED_VERSION_libtool-cross ?= "1.5.10" -PREFERRED_VERSION_libtool-sdk ?= "1.5.10" +PREFERRED_VERSION_libtool ?= "2.2.4" +PREFERRED_VERSION_libtool-native ?= "2.2.4" +PREFERRED_VERSION_libtool-cross ?= "2.2.4" +PREFERRED_VERSION_libtool-sdk ?= "2.2.4" PREFERRED_VERSION_linux-libc-headers ?= "2.6.23" PREFERRED_VERSION_m4 ?= "1.4.8" PREFERRED_VERSION_m4-native ?= "1.4.8" @@ -69,7 +69,6 @@ PREFERRED_VERSION_udev ?= "118" PREFERRED_VERSION_avahi ?= "0.6.23" PREFERRED_VERSION_gstreamer ?= "0.10.17" PREFERRED_VERSION_gst-plugins-base ?= "0.10.17" -PREFERRED_VERSION_tiff ?= "3.7.2" PREFERRED_VERSION_fakeroot ?= "1.9.6" PREFERRED_VERSION_fakeroot-native ?= "1.9.6" @@ -79,27 +78,5 @@ PREFERRED_VERSION_fakeroot-native ?= "1.9.6" # libusb will overwrite libusb-compat in staging. PREFERRED_VERSION_libusb ?= "0.0.0" -# mtd-utils 1.2.0+git cannot be fetched, so SlugOS will stick -# with 1.1.0 for now: -PREFERRED_VERSION_mtd-utils ?= "1.1.0" - # boost 1.36 won't build PREFERRED_VERSION_boost ?= "1.33.1" - -####################### Obsolete stuff, not sure why we keep this: - -# New pango and older glib-2.0 versions don't mix, -# so specify exactly what we would like to build. -#PREFERRED_VERSION_pango ?= "1.20.5" -#PREFERRED_VERSION_glib-2.0 ?= "2.16.1" -#PREFERRED_VERSION_cairo ?= "1.4.8" -# -# Stick with an older gettext and e2fsprogs stuff -# and gnutls... (our autotools is too old at the moment) -#PREFERRED_VERSION_gnutls ?= "1.6.3" -#PREFERRED_VERSION_gettext ?= "0.14.1" -#PREFERRED_VERSION_gettext-native ?= "0.14.1" -#PREFERRED_VERSION_e2fsprogs-libs ?= "1.39" -#PREFERRED_VERSION_e2fsprogs ?= "1.38" -#PREFERRED_VERSION_e2fsprogs-native ?= "1.38" - -- cgit v1.2.3 From 7f5eb77c8a7e45b19e07286d7a5861ed94fdaa2a Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 21 Mar 2009 17:14:07 -0500 Subject: slugos-packages: demote irrsi - won't build with newer libtool. --- recipes/meta/slugos-packages.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/meta/slugos-packages.bb b/recipes/meta/slugos-packages.bb index 1428fdcd7b..8ad95d6f3f 100644 --- a/recipes/meta/slugos-packages.bb +++ b/recipes/meta/slugos-packages.bb @@ -110,7 +110,6 @@ SLUGOS_PACKAGES = "\ ipkg-utils \ iptables \ ircp \ - irssi \ joe \ jpeg \ kexec-tools \ @@ -258,6 +257,7 @@ SLUGOS_BROKEN_PACKAGES = "\ dsniff \ eciadsl \ gspcav1 \ + irssi \ linphone \ lirc-modules lirc \ madfu \ -- cgit v1.2.3 From 807d0af14bd12290c0471726c49d2e8658b11346 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 21 Mar 2009 18:07:57 -0500 Subject: SlugOS: remove preferred_version restrictions for more packages. --- conf/distro/include/preferred-slugos-versions.inc | 9 --------- 1 file changed, 9 deletions(-) diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc index e36d4cdb44..992235a4b9 100644 --- a/conf/distro/include/preferred-slugos-versions.inc +++ b/conf/distro/include/preferred-slugos-versions.inc @@ -63,15 +63,6 @@ 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_gstreamer ?= "0.10.17" -PREFERRED_VERSION_gst-plugins-base ?= "0.10.17" -PREFERRED_VERSION_fakeroot ?= "1.9.6" -PREFERRED_VERSION_fakeroot-native ?= "1.9.6" - # 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 -- cgit v1.2.3