diff options
16 files changed, 242 insertions, 283 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index f896492364..8724ad2cf1 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -231,6 +231,8 @@ module_autoload_ipsec = "ipsec" module_autoload_ircomm-tty = "ircomm-tty" module_autoload_rfcomm = "rfcomm" module_autoload_sa1100-rtc = "sa1100-rtc" +# sa1100-rtc was renamed in 2.6.23 onwards +module_autoload_rtc-sa1100 = "rtc-sa1100" # alias defaults (alphabetically sorted) module_conf_af_packet = "alias net-pf-17 af_packet" diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py index 39031bf237..3419cab2e5 100755 --- a/contrib/python/generate-manifest-2.5.py +++ b/contrib/python/generate-manifest-2.5.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # generate Python Manifest for the OpenEmbedded build system -# (C) 2002-2007 Michael 'Mickey' Lauer <mlauer@vanille-media.de> +# (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de> # (C) 2007 Jeremy Laine # licensed under MIT, see COPYING.MIT @@ -10,11 +10,11 @@ import sys import time VERSION = "2.5.1" -# increase when touching python-core, this should be the same ml version as in python_2.5.1.bb -BASEREV = 6 +# increase when touching python-core, this should be the same ml version as in python_2.5.x.bb +BASEREV = 7 -__author__ = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -__version__ = "20071205" +__author__ = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" +__version__ = "20080122" class MakefileMaker: @@ -24,7 +24,7 @@ class MakefileMaker: self.targetPrefix = "${libdir}/python%s/" % VERSION[:3] self.output = outfile self.out( "#" * 120 ) - self.out( "### AUTO-GENERATED by '%s' [(C) 2002-2007 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on %s" % ( sys.argv[0], time.asctime() ) ) + self.out( "### AUTO-GENERATED by '%s' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on %s" % ( sys.argv[0], time.asctime() ) ) self.out( "###" ) self.out( "### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy" ) self.out( "###" ) diff --git a/packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb b/packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb deleted file mode 100644 index 5cca31d74b..0000000000 --- a/packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb +++ /dev/null @@ -1,68 +0,0 @@ -require linux.inc -require linux-openmoko.inc - -DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko" -VANILLA_VERSION = "2.6.23" -#KERNEL_VERSION = "2.6.23-rc9" -KERNEL_RELEASE = "2.6.23.1" - -# If you use a rc, you will need to use this: -#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}-moko11+svnr${SRCREV}" - -KERNEL_VERSION = "${KERNEL_RELEASE}" -PV = "${KERNEL_RELEASE}+svnr${SRCREV}" -PR = "r3" - -KERNEL_IMAGETYPE = "uImage" -UBOOT_ENTRYPOINT = "30008000" - -############################################################## -# source and patches -# -SRCREV_FORMAT = "patches" -SRCREV = "3140" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_VERSION}.bz2;patch=1 \ - svn://svn.openmoko.org/branches/src/target/kernel/2.6.23.x;module=patches;proto=http;name=patches \ - file://squashfs-2.6.23.patch;patch=1 \ - file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1 \ -# file://printascii-2.6.23.patch;patch=1 \ - file://hack-gta02-cpu.patch;patch=1 \ - file://fix-gta01-flowcontrol2-2.6.23.patch;patch=1 \ - file://defconfig-2.6.23.1 \ - file://logo_linux_clut224.ppm" -S = "${WORKDIR}/linux-${VANILLA_VERSION}" - -############################################################## -# kernel image resides on a seperate flash partition (for now) -# -FILES_kernel-image = "" -ALLOW_EMPTY = "1" - -COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02' - -CMDLINE = "unused -- bootloader passes ATAG list" - -############################################################### -# module configs specific to this kernel -# - -# usb -module_autoload_ohci-hcd = "ohci-hcd" -module_autoload_hci_usb = "hci_usb" -module_autoload_g_ether = "g_ether" -# audio -module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" -# sd/mmc -module_autoload_s3cmci = "s3cmci" - -do_prepatch() { - mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av - mv patches patches.openmoko - mv .pc .pc.old - mv ${WORKDIR}/defconfig-${KERNEL_VERSION} ${WORKDIR}/defconfig -} - -addtask prepatch after do_unpack before do_patch diff --git a/packages/linux/linux-openmoko-devel_svn+2.6.24-rc6.bb b/packages/linux/linux-openmoko-devel_svn+2.6.24-rc6.bb deleted file mode 100644 index 733cd3fb3b..0000000000 --- a/packages/linux/linux-openmoko-devel_svn+2.6.24-rc6.bb +++ /dev/null @@ -1,68 +0,0 @@ -require linux.inc -require linux-openmoko.inc - -DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko" -VANILLA_VERSION = "2.6.23" -KERNEL_RELEASE = "2.6.24-rc6" - -KERNEL_VERSION = "${KERNEL_RELEASE}" - -# If you use a rc, you will need to use this: -PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}" -#PV = "${KERNEL_RELEASE}+svnr${SRCREV}" -PR = "r2" - -KERNEL_IMAGETYPE = "uImage" -UBOOT_ENTRYPOINT = "30008000" - -############################################################## -# source and patches -# -SRCREV_FORMAT = "patches" -SRCREV = "3741" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_VERSION}.bz2 \ - svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=patches;proto=http;name=patches \ -# file://squashfs-2.6.23.patch;patch=1 \ -# file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1 \ -# file://printascii-2.6.23.patch;patch=1 \ -# file://hack-gta02-cpu.patch;patch=1 \ -# file://fix-gta01-flowcontrol2-2.6.23.patch;patch=1 \ - file://defconfig-${KERNEL_VERSION} \ - file://logo_linux_clut224.ppm" -S = "${WORKDIR}/linux-${VANILLA_VERSION}" - -############################################################## -# kernel image resides on a seperate flash partition (for now) -# -FILES_kernel-image = "" -ALLOW_EMPTY = "1" - -COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02' - -CMDLINE = "unused -- bootloader passes ATAG list" - -############################################################### -# module configs specific to this kernel -# - -# usb -module_autoload_ohci-hcd = "ohci-hcd" -module_autoload_hci_usb = "hci_usb" -module_autoload_g_ether = "g_ether" -# audio -module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" -# sd/mmc -module_autoload_s3cmci = "s3cmci" - -do_prepatch() { - cd ${S} && patch -p1 < ${WORKDIR}/patch-${KERNEL_VERSION} - mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av - mv patches patches.openmoko - mv .pc .pc.old - mv ${WORKDIR}/defconfig-${KERNEL_VERSION} ${WORKDIR}/defconfig -} - -addtask prepatch after do_unpack before do_patch diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie b/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie index 06b4d15ddb..07258b44ed 100644 --- a/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie +++ b/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.24-rc8 -# Sun Jan 20 18:52:49 2008 +# Mon Jan 21 21:35:18 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1279,9 +1279,9 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_KARMA_PARTITION is not set # CONFIG_EFI_PARTITION is not set # CONFIG_SYSV68_PARTITION is not set -CONFIG_NLS=y +CONFIG_NLS=m CONFIG_NLS_DEFAULT="cp437" -CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_CODEPAGE_737=m CONFIG_NLS_CODEPAGE_775=m CONFIG_NLS_CODEPAGE_850=m @@ -1305,7 +1305,7 @@ CONFIG_NLS_ISO8859_8=m CONFIG_NLS_CODEPAGE_1250=m CONFIG_NLS_CODEPAGE_1251=m CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_1=m CONFIG_NLS_ISO8859_2=m CONFIG_NLS_ISO8859_3=m CONFIG_NLS_ISO8859_4=m diff --git a/packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb b/packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb index 7c41e54c20..ec06f202f3 100644 --- a/packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb +++ b/packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_collie = "1" diff --git a/packages/prelink/prelink-20060712/.mtn2git_empty b/packages/prelink/prelink-20061027/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/prelink/prelink-20060712/.mtn2git_empty +++ b/packages/prelink/prelink-20061027/.mtn2git_empty diff --git a/packages/prelink/prelink-20060712/arm_eabi.patch b/packages/prelink/prelink-20061027/arm_eabi.patch index b234af9b3f..dbce9d2895 100644 --- a/packages/prelink/prelink-20060712/arm_eabi.patch +++ b/packages/prelink/prelink-20061027/arm_eabi.patch @@ -1,16 +1,22 @@ -Index: prelink-0.0.20050901/src/arch-arm.c +--- + src/arch-arm.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 172 insertions(+), 5 deletions(-) + +Index: prelink-0.0.20061027/src/arch-arm.c =================================================================== ---- prelink-0.0.20050901.orig/src/arch-arm.c 2004-09-30 17:07:57.000000000 +0100 -+++ prelink-0.0.20050901/src/arch-arm.c 2006-04-07 14:41:25.000000000 +0100 -@@ -145,6 +145,24 @@ +--- prelink-0.0.20061027.orig/src/arch-arm.c 2006-08-13 16:18:17.000000000 +0100 ++++ prelink-0.0.20061027/src/arch-arm.c 2007-09-04 12:29:06.000000000 +0100 +@@ -145,6 +145,26 @@ arm_prelink_rel (struct prelink_info *in error (0, 0, "%s: R_ARM_PC24 relocs with non-zero addend should not be present in prelinked REL sections", dso->filename); return 1; -+ case R_ARM_TLS_DTPOFF32: -+ write_le32 (dso, rel->r_offset, value); ++ /* DTPOFF32, DTPMOD32 and TPOFF32 is impossible to predict unless prelink ++ sets the rules. Also for DTPOFF32/TPOFF32 there is REL->RELA problem. */ ++ case R_ARM_TLS_DTPOFF32: ++ if (dso->ehdr.e_type == ET_EXEC) ++ error (0, 0, "%s: R_ARM_TLS_DTPOFF32 relocs should not be present in prelinked ET_EXEC REL sections", ++ dso->filename); + break; -+ /* DTPMOD32 and TPOFF32 is impossible to predict unless prelink -+ sets the rules. Also for TPOFF{32,} there is REL->RELA problem. */ + case R_ARM_TLS_DTPMOD32: + if (dso->ehdr.e_type == ET_EXEC) + { @@ -27,14 +33,15 @@ Index: prelink-0.0.20050901/src/arch-arm.c case R_ARM_COPY: if (dso->ehdr.e_type == ET_EXEC) /* COPY relocs are handled specially in generic code. */ -@@ -195,6 +213,24 @@ +@@ -195,6 +215,25 @@ arm_prelink_rela (struct prelink_info *i write_le32 (dso, rela->r_offset, (read_ule32 (dso, rela->r_offset) & 0xff000000) | val); break; + case R_ARM_TLS_DTPOFF32: -+ write_le32 (dso, rela->r_offset, value + rela->r_addend); ++ if (dso->ehdr.e_type == ET_EXEC) ++ write_le32 (dso, rela->r_offset, value + rela->r_addend); + break; -+ /* DTPMOD32 and TPOFF32 is impossible to predict unless prelink ++ /* DTPMOD32 and TPOFF32 are impossible to predict unless prelink + sets the rules. */ + case R_ARM_TLS_DTPMOD32: + if (dso->ehdr.e_type == ET_EXEC) @@ -47,12 +54,12 @@ Index: prelink-0.0.20050901/src/arch-arm.c + case R_ARM_TLS_TPOFF32: + if (dso->ehdr.e_type == ET_EXEC && info->resolvetls) + write_le32 (dso, rela->r_offset, -+ -(value + rela->r_addend - info->resolvetls->offset)); ++ value + rela->r_addend + info->resolvetls->offset); + break; case R_ARM_COPY: if (dso->ehdr.e_type == ET_EXEC) /* COPY relocs are handled specially in generic code. */ -@@ -315,6 +351,7 @@ +@@ -315,6 +354,7 @@ arm_prelink_conflict_rel (DSO *dso, stru { GElf_Addr value; struct prelink_conflict *conflict; @@ -60,7 +67,7 @@ Index: prelink-0.0.20050901/src/arch-arm.c GElf_Rela *ret; if (GELF_R_TYPE (rel->r_info) == R_ARM_RELATIVE -@@ -324,8 +361,31 @@ +@@ -324,8 +364,32 @@ arm_prelink_conflict_rel (DSO *dso, stru conflict = prelink_conflict (info, GELF_R_SYM (rel->r_info), GELF_R_TYPE (rel->r_info)); if (conflict == NULL) @@ -71,8 +78,9 @@ Index: prelink-0.0.20050901/src/arch-arm.c + return 0; + switch (GELF_R_TYPE (rel->r_info)) + { -+ /* Even local DTPMOD and TPOFF relocs need conflicts. */ ++ /* Even local DTPMOD and {D,}TPOFF relocs need conflicts. */ + case R_ARM_TLS_DTPMOD32: ++ case R_ARM_TLS_DTPOFF32: + case R_ARM_TLS_TPOFF32: + break; + default: @@ -94,7 +102,7 @@ Index: prelink-0.0.20050901/src/arch-arm.c ret = prelink_conflict_add_rela (info); if (ret == NULL) return 1; -@@ -342,6 +402,33 @@ +@@ -342,6 +406,33 @@ arm_prelink_conflict_rel (DSO *dso, stru error (0, 0, "%s: R_ARM_%s relocs should not be present in prelinked REL sections", dso->filename, GELF_R_TYPE (rel->r_info) == R_ARM_ABS32 ? "ABS32" : "PC24"); return 1; @@ -117,18 +125,18 @@ Index: prelink-0.0.20050901/src/arch-arm.c + ret->r_addend = tls->modid; + break; + case R_ARM_TLS_DTPOFF32: -+ ret->r_addend = value; ++ ret->r_addend = value + read_ule32 (dso, rel->r_offset); + break; + case R_ARM_TLS_TPOFF32: -+ ret->r_addend = -(value + read_ule32 (dso, rel->r_offset) -+ - tls->offset); ++ ret->r_addend = value + read_ule32 (dso, rel->r_offset) ++ + tls->offset; + break; + } + break; case R_ARM_COPY: error (0, 0, "R_ARM_COPY should not be present in shared libraries"); return 1; -@@ -359,6 +446,7 @@ +@@ -359,6 +450,7 @@ arm_prelink_conflict_rela (DSO *dso, str { GElf_Addr value; struct prelink_conflict *conflict; @@ -136,7 +144,7 @@ Index: prelink-0.0.20050901/src/arch-arm.c GElf_Rela *ret; Elf32_Sword val; -@@ -369,8 +457,31 @@ +@@ -369,8 +461,32 @@ arm_prelink_conflict_rela (DSO *dso, str conflict = prelink_conflict (info, GELF_R_SYM (rela->r_info), GELF_R_TYPE (rela->r_info)); if (conflict == NULL) @@ -147,8 +155,9 @@ Index: prelink-0.0.20050901/src/arch-arm.c + return 0; + switch (GELF_R_TYPE (rela->r_info)) + { -+ /* Even local DTPMOD and TPOFF relocs need conflicts. */ ++ /* Even local DTPMOD and {D,}TPOFF relocs need conflicts. */ + case R_ARM_TLS_DTPMOD32: ++ case R_ARM_TLS_DTPOFF32: + case R_ARM_TLS_TPOFF32: + break; + default: @@ -170,7 +179,7 @@ Index: prelink-0.0.20050901/src/arch-arm.c ret = prelink_conflict_add_rela (info); if (ret == NULL) return 1; -@@ -398,6 +509,32 @@ +@@ -398,6 +514,32 @@ arm_prelink_conflict_rela (DSO *dso, str case R_ARM_COPY: error (0, 0, "R_ARM_COPY should not be present in shared libraries"); return 1; @@ -193,78 +202,80 @@ Index: prelink-0.0.20050901/src/arch-arm.c + ret->r_addend = tls->modid; + break; + case R_ARM_TLS_DTPOFF32: -+ ret->r_addend += value; ++ ret->r_addend = value + rela->r_addend; + break; + case R_ARM_TLS_TPOFF32: -+ ret->r_addend = -(value + rela->r_addend - tls->offset); ++ ret->r_addend = value + rela->r_addend + tls->offset; + break; + } + break; default: error (0, 0, "%s: Unknown arm relocation type %d", dso->filename, (int) GELF_R_TYPE (rela->r_info)); -@@ -418,6 +555,7 @@ +@@ -418,6 +560,8 @@ arm_rel_to_rela (DSO *dso, GElf_Rel *rel abort (); case R_ARM_RELATIVE: case R_ARM_ABS32: + case R_ARM_TLS_TPOFF32: ++ case R_ARM_TLS_DTPOFF32: rela->r_addend = (Elf32_Sword) read_ule32 (dso, rel->r_offset); break; case R_ARM_PC24: -@@ -426,6 +564,8 @@ +@@ -426,6 +570,7 @@ arm_rel_to_rela (DSO *dso, GElf_Rel *rel break; case R_ARM_COPY: case R_ARM_GLOB_DAT: -+ case R_ARM_TLS_DTPOFF32: + case R_ARM_TLS_DTPMOD32: rela->r_addend = 0; break; } -@@ -445,6 +585,7 @@ +@@ -445,6 +590,8 @@ arm_rela_to_rel (DSO *dso, GElf_Rela *re abort (); case R_ARM_RELATIVE: case R_ARM_ABS32: + case R_ARM_TLS_TPOFF32: ++ case R_ARM_TLS_DTPOFF32: write_le32 (dso, rela->r_offset, rela->r_addend); break; case R_ARM_PC24: -@@ -453,6 +594,8 @@ +@@ -453,6 +600,7 @@ arm_rela_to_rel (DSO *dso, GElf_Rela *re | ((rela->r_addend >> 2) & 0xffffff)); break; case R_ARM_GLOB_DAT: + case R_ARM_TLS_DTPMOD32: -+ case R_ARM_TLS_DTPOFF32: write_le32 (dso, rela->r_offset, 0); break; } -@@ -488,6 +631,13 @@ +@@ -488,6 +636,15 @@ arm_need_rel_to_rela (DSO *dso, int firs /* FALLTHROUGH */ case R_ARM_PC24: return 1; ++ case R_ARM_TLS_DTPOFF32: + case R_ARM_TLS_TPOFF32: -+ /* In shared libraries TPOFF is changed always into ++ /* In shared libraries {D,}TPOFF32 is changed always into + conflicts, for executables we need to preserve + original addend. */ -+ if (dso->ehdr.e_type == ET_EXEC) ++ if (dso->ehdr.e_type == ET_EXEC) { + return 1; ++ } + break; } } } -@@ -612,6 +762,12 @@ +@@ -612,6 +769,12 @@ arm_undo_prelink_rel (DSO *dso, GElf_Rel return 0; error (0, 0, "%s: R_ARM_COPY reloc in shared library?", dso->filename); return 1; + case R_ARM_TLS_DTPMOD32: -+ case R_ARM_TLS_DTPOFF32: + write_le32 (dso, rel->r_offset, 0); + break; ++ case R_ARM_TLS_DTPOFF32: + case R_ARM_TLS_TPOFF32: + break; default: error (0, 0, "%s: Unknown arm relocation type %d", dso->filename, (int) GELF_R_TYPE (rel->r_info)); -@@ -634,6 +790,10 @@ +@@ -634,6 +797,10 @@ arm_reloc_class (int reloc_type) { case R_ARM_COPY: return RTYPE_CLASS_COPY; case R_ARM_JUMP_SLOT: return RTYPE_CLASS_PLT; @@ -275,7 +286,7 @@ Index: prelink-0.0.20050901/src/arch-arm.c default: return RTYPE_CLASS_VALID; } } -@@ -646,7 +806,7 @@ +@@ -646,7 +813,7 @@ PL_ARCH = { .R_JMP_SLOT = R_ARM_JUMP_SLOT, .R_COPY = R_ARM_COPY, .R_RELATIVE = R_ARM_RELATIVE, diff --git a/packages/prelink/prelink-20060712/prelink.conf b/packages/prelink/prelink-20061027/prelink.conf index c5a4f4adc3..c5a4f4adc3 100644 --- a/packages/prelink/prelink-20060712/prelink.conf +++ b/packages/prelink/prelink-20061027/prelink.conf diff --git a/packages/prelink/prelink-20060712/prelink.cron.daily b/packages/prelink/prelink-20061027/prelink.cron.daily index 0b3c07322c..0b3c07322c 100644 --- a/packages/prelink/prelink-20060712/prelink.cron.daily +++ b/packages/prelink/prelink-20061027/prelink.cron.daily diff --git a/packages/prelink/prelink-20060712/prelink.default b/packages/prelink/prelink-20061027/prelink.default index 901258ed2a..901258ed2a 100644 --- a/packages/prelink/prelink-20060712/prelink.default +++ b/packages/prelink/prelink-20061027/prelink.default diff --git a/packages/prelink/prelink_20060712.bb b/packages/prelink/prelink_20061027.bb index fcf990b7a0..e93f1f2515 100644 --- a/packages/prelink/prelink_20060712.bb +++ b/packages/prelink/prelink_20061027.bb @@ -4,7 +4,7 @@ DESCRIPTION = " The prelink package contains a utility which modifies ELF shared and executables, so that far fewer relocations need to be resolved at \ runtime and thus programs come up faster." LICENSE = "GPL" -PR = "r2" +PR = "r5" SRC_URI = "${DEBIAN_MIRROR}/main/p/prelink/prelink_0.0.${PV}.orig.tar.gz \ file://prelink.conf \ @@ -19,7 +19,7 @@ S = "${WORKDIR}/prelink-0.0.${PV}" EXTRA_OECONF = "--disable-64bit" -inherit autotools +inherit autotools do_install_append () { install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc index 165fd2ae60..edf5c7697f 100644 --- a/packages/python/python-2.5-manifest.inc +++ b/packages/python/python-2.5-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by '../../contrib/python/generate-manifest-2.5.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Sun Jan 13 16:02:57 2008 +### AUTO-GENERATED by 'contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Tue Jan 22 04:03:18 2008 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -13,287 +13,287 @@ PROVIDES+="python-profile python-threading python-distutils python-textutils pyt PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " DESCRIPTION_python-profile="Python Basic Profiling Support" -PR_python-profile="ml6" +PR_python-profile="ml7" RDEPENDS_python-profile="python-core" FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* " DESCRIPTION_python-threading="Python Threading & Synchronization Support" -PR_python-threading="ml6" +PR_python-threading="ml7" RDEPENDS_python-threading="python-core python-lang" FILES_python-threading="${libdir}/python2.5/_threading_local.* ${libdir}/python2.5/dummy_thread.* ${libdir}/python2.5/dummy_threading.* ${libdir}/python2.5/mutex.* ${libdir}/python2.5/threading.* ${libdir}/python2.5/Queue.* " DESCRIPTION_python-distutils="Python Distribution Utilities" -PR_python-distutils="ml6" +PR_python-distutils="ml7" RDEPENDS_python-distutils="python-core" FILES_python-distutils="${libdir}/python2.5/config ${libdir}/python2.5/distutils " DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support" -PR_python-textutils="ml6" +PR_python-textutils="ml7" RDEPENDS_python-textutils="python-core python-io python-re python-stringold" FILES_python-textutils="${libdir}/python2.5/lib-dynload/_csv.so ${libdir}/python2.5/csv.* ${libdir}/python2.5/optparse.* ${libdir}/python2.5/textwrap.* " DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support" -PR_python-codecs="ml6" +PR_python-codecs="ml7" RDEPENDS_python-codecs="python-core python-lang" FILES_python-codecs="${libdir}/python2.5/codecs.* ${libdir}/python2.5/encodings ${libdir}/python2.5/gettext.* ${libdir}/python2.5/locale.* ${libdir}/python2.5/lib-dynload/_locale.so ${libdir}/python2.5/lib-dynload/unicodedata.so ${libdir}/python2.5/stringprep.* ${libdir}/python2.5/xdrlib.* " DESCRIPTION_python-ctypes="Python C Types Support" -PR_python-ctypes="ml6" +PR_python-ctypes="ml7" RDEPENDS_python-ctypes="python-core" FILES_python-ctypes="${libdir}/python2.5/ctypes ${libdir}/python2.5/lib-dynload/_ctypes.so " DESCRIPTION_python-pickle="Python Persistence Support" -PR_python-pickle="ml6" +PR_python-pickle="ml7" RDEPENDS_python-pickle="python-core python-codecs python-io python-re" FILES_python-pickle="${libdir}/python2.5/pickle.* ${libdir}/python2.5/shelve.* ${libdir}/python2.5/lib-dynload/cPickle.so " DESCRIPTION_python-datetime="Python Calendar and Time support" -PR_python-datetime="ml6" +PR_python-datetime="ml7" RDEPENDS_python-datetime="python-core python-codecs" FILES_python-datetime="${libdir}/python2.5/_strptime.* ${libdir}/python2.5/calendar.* ${libdir}/python2.5/lib-dynload/datetime.so " DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" -PR_python-core="ml6" +PR_python-core="ml7" RDEPENDS_python-core="" FILES_python-core="${libdir}/python2.5/__future__.* ${libdir}/python2.5/copy.* ${libdir}/python2.5/copy_reg.* ${libdir}/python2.5/ConfigParser.* ${libdir}/python2.5/getopt.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/new.* ${libdir}/python2.5/os.* ${libdir}/python2.5/posixpath.* ${libdir}/python2.5/struct.* ${libdir}/python2.5/warnings.* ${libdir}/python2.5/site.* ${libdir}/python2.5/stat.* ${libdir}/python2.5/UserDict.* ${libdir}/python2.5/UserList.* ${libdir}/python2.5/UserString.* ${libdir}/python2.5/lib-dynload/binascii.so ${libdir}/python2.5/lib-dynload/_struct.so ${libdir}/python2.5/lib-dynload/time.so ${libdir}/python2.5/lib-dynload/xreadlines.so ${libdir}/python2.5/types.* ${bindir}/python* " DESCRIPTION_python-io="Python Low-Level I/O" -PR_python-io="ml6" +PR_python-io="ml7" RDEPENDS_python-io="python-core python-math" FILES_python-io="${libdir}/python2.5/lib-dynload/_socket.so ${libdir}/python2.5/lib-dynload/_ssl.so ${libdir}/python2.5/lib-dynload/select.so ${libdir}/python2.5/lib-dynload/termios.so ${libdir}/python2.5/lib-dynload/cStringIO.so ${libdir}/python2.5/pipes.* ${libdir}/python2.5/socket.* ${libdir}/python2.5/tempfile.* ${libdir}/python2.5/StringIO.* " DESCRIPTION_python-compiler="Python Compiler Support" -PR_python-compiler="ml6" +PR_python-compiler="ml7" RDEPENDS_python-compiler="python-core" FILES_python-compiler="${libdir}/python2.5/compiler " DESCRIPTION_python-compression="Python High Level Compression Support" -PR_python-compression="ml6" +PR_python-compression="ml7" RDEPENDS_python-compression="python-core python-zlib" FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* " DESCRIPTION_python-re="Python Regular Expression APIs" -PR_python-re="ml6" +PR_python-re="ml7" RDEPENDS_python-re="python-core" FILES_python-re="${libdir}/python2.5/re.* ${libdir}/python2.5/sre.* ${libdir}/python2.5/sre_compile.* ${libdir}/python2.5/sre_constants* ${libdir}/python2.5/sre_parse.* " DESCRIPTION_python-xmlrpc="Python XMLRPC Support" -PR_python-xmlrpc="ml6" +PR_python-xmlrpc="ml7" RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang" FILES_python-xmlrpc="${libdir}/python2.5/xmlrpclib.* ${libdir}/python2.5/SimpleXMLRPCServer.* " DESCRIPTION_python-terminal="Python Terminal Controlling Support" -PR_python-terminal="ml6" +PR_python-terminal="ml7" RDEPENDS_python-terminal="python-core python-io" FILES_python-terminal="${libdir}/python2.5/pty.* ${libdir}/python2.5/tty.* " DESCRIPTION_python-email="Python Email Support" -PR_python-email="ml6" +PR_python-email="ml7" RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image" FILES_python-email="${libdir}/python2.5/email " DESCRIPTION_python-image="Python Graphical Image Handling" -PR_python-image="ml6" +PR_python-image="ml7" RDEPENDS_python-image="python-core" FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so " DESCRIPTION_python-core-dbg="Python core module debug information" -PR_python-core-dbg="ml6" +PR_python-core-dbg="ml7" RDEPENDS_python-core-dbg="python-core" FILES_python-core-dbg="${libdir}/python2.5/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug " DESCRIPTION_python-resource="Python Resource Control Interface" -PR_python-resource="ml6" +PR_python-resource="ml7" RDEPENDS_python-resource="python-core" FILES_python-resource="${libdir}/python2.5/lib-dynload/resource.so " DESCRIPTION_python-devel="Python Development Package" -PR_python-devel="ml6" +PR_python-devel="ml7" RDEPENDS_python-devel="python-core" FILES_python-devel="${includedir} ${libdir}/python2.5/config " DESCRIPTION_python-math="Python Math Support" -PR_python-math="ml6" +PR_python-math="ml7" RDEPENDS_python-math="python-core" FILES_python-math="${libdir}/python2.5/lib-dynload/cmath.so ${libdir}/python2.5/lib-dynload/math.so ${libdir}/python2.5/lib-dynload/_random.so ${libdir}/python2.5/random.* ${libdir}/python2.5/sets.* " DESCRIPTION_python-hotshot="Python Hotshot Profiler" -PR_python-hotshot="ml6" +PR_python-hotshot="ml7" RDEPENDS_python-hotshot="python-core" FILES_python-hotshot="${libdir}/python2.5/hotshot ${libdir}/python2.5/lib-dynload/_hotshot.so " DESCRIPTION_python-unixadmin="Python Unix Administration Support" -PR_python-unixadmin="ml6" +PR_python-unixadmin="ml7" RDEPENDS_python-unixadmin="python-core" FILES_python-unixadmin="${libdir}/python2.5/lib-dynload/nis.so ${libdir}/python2.5/lib-dynload/grp.so ${libdir}/python2.5/lib-dynload/pwd.so ${libdir}/python2.5/getpass.* " DESCRIPTION_python-syslog="Python's syslog Interface" -PR_python-syslog="ml6" +PR_python-syslog="ml7" RDEPENDS_python-syslog="python-core" FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so " DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings" -PR_python-tkinter="ml6" +PR_python-tkinter="ml7" RDEPENDS_python-tkinter="python-core" FILES_python-tkinter="${libdir}/python2.5/lib-dynload/_tkinter.so ${libdir}/python2.5/lib-tk " DESCRIPTION_python-gdbm="Python GNU Database Support" -PR_python-gdbm="ml6" +PR_python-gdbm="ml7" RDEPENDS_python-gdbm="python-core" FILES_python-gdbm="${libdir}/python2.5/lib-dynload/gdbm.so " DESCRIPTION_python-fcntl="Python's fcntl Interface" -PR_python-fcntl="ml6" +PR_python-fcntl="ml7" RDEPENDS_python-fcntl="python-core" FILES_python-fcntl="${libdir}/python2.5/lib-dynload/fcntl.so " DESCRIPTION_python-netclient="Python Internet Protocol Clients" -PR_python-netclient="ml6" +PR_python-netclient="ml7" RDEPENDS_python-netclient="python-core python-crypt python-datetime python-io python-lang python-logging python-mime" FILES_python-netclient="${libdir}/python2.5/*Cookie*.* ${libdir}/python2.5/base64.* ${libdir}/python2.5/cookielib.* ${libdir}/python2.5/ftplib.* ${libdir}/python2.5/gopherlib.* ${libdir}/python2.5/hmac.* ${libdir}/python2.5/httplib.* ${libdir}/python2.5/mimetypes.* ${libdir}/python2.5/nntplib.* ${libdir}/python2.5/poplib.* ${libdir}/python2.5/smtplib.* ${libdir}/python2.5/telnetlib.* ${libdir}/python2.5/urllib.* ${libdir}/python2.5/urllib2.* ${libdir}/python2.5/urlparse.* " DESCRIPTION_python-pprint="Python Pretty-Print Support" -PR_python-pprint="ml6" +PR_python-pprint="ml7" RDEPENDS_python-pprint="python-core" FILES_python-pprint="${libdir}/python2.5/pprint.* " DESCRIPTION_python-netserver="Python Internet Protocol Servers" -PR_python-netserver="ml6" +PR_python-netserver="ml7" RDEPENDS_python-netserver="python-core python-netclient" FILES_python-netserver="${libdir}/python2.5/cgi.* ${libdir}/python2.5/BaseHTTPServer.* ${libdir}/python2.5/SimpleHTTPServer.* ${libdir}/python2.5/SocketServer.* " DESCRIPTION_python-curses="Python Curses Support" -PR_python-curses="ml6" +PR_python-curses="ml7" RDEPENDS_python-curses="python-core" FILES_python-curses="${libdir}/python2.5/curses ${libdir}/python2.5/lib-dynload/_curses.so ${libdir}/python2.5/lib-dynload/_curses_panel.so " DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon" -PR_python-smtpd="ml6" +PR_python-smtpd="ml7" RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime" FILES_python-smtpd="${bindir}/smtpd.* " DESCRIPTION_python-html="Python HTML Processing" -PR_python-html="ml6" +PR_python-html="ml7" RDEPENDS_python-html="python-core" FILES_python-html="${libdir}/python2.5/formatter.* ${libdir}/python2.5/htmlentitydefs.* ${libdir}/python2.5/htmllib.* ${libdir}/python2.5/markupbase.* ${libdir}/python2.5/sgmllib.* " DESCRIPTION_python-readline="Python Readline Support" -PR_python-readline="ml6" +PR_python-readline="ml7" RDEPENDS_python-readline="python-core" FILES_python-readline="${libdir}/python2.5/lib-dynload/readline.so ${libdir}/python2.5/rlcompleter.* " DESCRIPTION_python-subprocess="Python Subprocess Support" -PR_python-subprocess="ml6" +PR_python-subprocess="ml7" RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle" FILES_python-subprocess="${libdir}/python2.5/subprocess.* " DESCRIPTION_python-pydoc="Python Interactive Help Support" -PR_python-pydoc="ml6" +PR_python-pydoc="ml7" RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.5/pydoc.* " DESCRIPTION_python-logging="Python Logging Support" -PR_python-logging="ml6" +PR_python-logging="ml7" RDEPENDS_python-logging="python-core python-io python-lang python-stringold" FILES_python-logging="${libdir}/python2.5/logging " DESCRIPTION_python-mailbox="Python Mailbox Format Support" -PR_python-mailbox="ml6" +PR_python-mailbox="ml7" RDEPENDS_python-mailbox="python-core python-mime" FILES_python-mailbox="${libdir}/python2.5/mailbox.* " DESCRIPTION_python-xml="Python basic XML support." -PR_python-xml="ml6" +PR_python-xml="ml7" RDEPENDS_python-xml="python-core python-re python-netclient" FILES_python-xml="${libdir}/python2.5/lib-dynload/pyexpat.so ${libdir}/python2.5/xml ${libdir}/python2.5/xmllib.* " DESCRIPTION_python-mime="Python MIME Handling APIs" -PR_python-mime="ml6" +PR_python-mime="ml7" RDEPENDS_python-mime="python-core python-io" FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* " DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support" -PR_python-sqlite3="ml6" +PR_python-sqlite3="ml7" RDEPENDS_python-sqlite3="python-core" FILES_python-sqlite3="${libdir}/python2.5/sqlite3 " DESCRIPTION_python-tests="Python Tests" -PR_python-tests="ml6" +PR_python-tests="ml7" RDEPENDS_python-tests="python-core" FILES_python-tests="${libdir}/python2.5/test " DESCRIPTION_python-unittest="Python Unit Testing Framework" -PR_python-unittest="ml6" +PR_python-unittest="ml7" RDEPENDS_python-unittest="python-core python-stringold python-lang" FILES_python-unittest="${libdir}/python2.5/unittest.* " DESCRIPTION_python-stringold="Python String APIs [deprecated]" -PR_python-stringold="ml6" +PR_python-stringold="ml7" RDEPENDS_python-stringold="python-core python-re" FILES_python-stringold="${libdir}/python2.5/lib-dynload/strop.so ${libdir}/python2.5/string.* " DESCRIPTION_python-robotparser="Python robots.txt parser" -PR_python-robotparser="ml6" +PR_python-robotparser="ml7" RDEPENDS_python-robotparser="python-core python-netclient" FILES_python-robotparser="${libdir}/python2.5/robotparser.* " DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries" -PR_python-lib-old-and-deprecated="ml6" +PR_python-lib-old-and-deprecated="ml7" RDEPENDS_python-lib-old-and-deprecated="python-core" FILES_python-lib-old-and-deprecated="${libdir}/python2.5/lib-old " DESCRIPTION_python-compile="Python Bytecode Compilation Support" -PR_python-compile="ml6" +PR_python-compile="ml7" RDEPENDS_python-compile="python-core" FILES_python-compile="${libdir}/python2.5/py_compile.* ${libdir}/python2.5/compileall.* " DESCRIPTION_python-debugger="Python Debugger" -PR_python-debugger="ml6" +PR_python-debugger="ml7" RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell" FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* " DESCRIPTION_python-shell="Python Shell-Like Functionality" -PR_python-shell="ml6" +PR_python-shell="ml7" RDEPENDS_python-shell="python-core python-re" FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shutil.* " DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" -PR_python-bsddb="ml6" +PR_python-bsddb="ml7" RDEPENDS_python-bsddb="python-core" FILES_python-bsddb="${libdir}/python2.5/bsddb " DESCRIPTION_python-mmap="Python Memory-Mapped-File Support" -PR_python-mmap="ml6" +PR_python-mmap="ml7" RDEPENDS_python-mmap="python-core python-io" FILES_python-mmap="${libdir}/python2.5/lib-dynload/mmap.so " DESCRIPTION_python-zlib="Python zlib Support." -PR_python-zlib="ml6" +PR_python-zlib="ml7" RDEPENDS_python-zlib="python-core" FILES_python-zlib="${libdir}/python2.5/lib-dynload/zlib.so " DESCRIPTION_python-db="Python File-Based Database Support" -PR_python-db="ml6" +PR_python-db="ml7" RDEPENDS_python-db="python-core" FILES_python-db="${libdir}/python2.5/anydbm.* ${libdir}/python2.5/dumbdbm.* ${libdir}/python2.5/whichdb.* " DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support" -PR_python-crypt="ml6" +PR_python-crypt="ml7" RDEPENDS_python-crypt="python-core" FILES_python-crypt="${libdir}/python2.5/hashlib.* ${libdir}/python2.5/md5.* ${libdir}/python2.5/sha.* ${libdir}/python2.5/lib-dynload/crypt.so ${libdir}/python2.5/lib-dynload/_hashlib.so ${libdir}/python2.5/lib-dynload/_sha256.so ${libdir}/python2.5/lib-dynload/_sha512.so " DESCRIPTION_python-idle="Python Integrated Development Environment" -PR_python-idle="ml6" +PR_python-idle="ml7" RDEPENDS_python-idle="python-core python-tkinter" FILES_python-idle="${bindir}/idle ${libdir}/python2.5/idlelib " DESCRIPTION_python-lang="Python Low-Level Language Support" -PR_python-lang="ml6" +PR_python-lang="ml7" RDEPENDS_python-lang="python-core" FILES_python-lang="${libdir}/python2.5/lib-dynload/array.so ${libdir}/python2.5/lib-dynload/parser.so ${libdir}/python2.5/lib-dynload/operator.so ${libdir}/python2.5/lib-dynload/_weakref.so ${libdir}/python2.5/lib-dynload/itertools.so ${libdir}/python2.5/lib-dynload/collections.so ${libdir}/python2.5/lib-dynload/_bisect.so ${libdir}/python2.5/lib-dynload/_heapq.so ${libdir}/python2.5/atexit.* ${libdir}/python2.5/bisect.* ${libdir}/python2.5/code.* ${libdir}/python2.5/codeop.* ${libdir}/python2.5/dis.* ${libdir}/python2.5/heapq.* ${libdir}/python2.5/inspect.* ${libdir}/python2.5/keyword.* ${libdir}/python2.5/opcode.* ${libdir}/python2.5/repr.* ${libdir}/python2.5/token.* ${libdir}/python2.5/tokenize.* ${libdir}/python2.5/traceback.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/weakref.* " DESCRIPTION_python-audio="Python Audio Handling" -PR_python-audio="ml6" +PR_python-audio="ml7" RDEPENDS_python-audio="python-core" FILES_python-audio="${libdir}/python2.5/wave.* ${libdir}/python2.5/chunk.* ${libdir}/python2.5/sndhdr.* ${libdir}/python2.5/lib-dynload/ossaudiodev.so ${libdir}/python2.5/lib-dynload/audioop.so " diff --git a/packages/python/python-2.5.1/sitecustomize.py b/packages/python/python-2.5.1/sitecustomize.py new file mode 100644 index 0000000000..b5e78d3200 --- /dev/null +++ b/packages/python/python-2.5.1/sitecustomize.py @@ -0,0 +1,45 @@ +# OpenEmbedded sitecustomize.py (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de> +# GPLv2 or later +# Version: 20082201 +# Features: +# * set proper default encoding +# * enable readline completion in the interactive interpreter +# * load command line history on startup +# * save command line history on exit + +HISTORY_FILENAME = "/tmp/python-history-file.txt" + +def __exithandler(): + try: + readline.write_history_file( HISTORY_FILENAME ) + except IOError: + pass + +def __registerExitHandler(): + import atexit + atexit.register( __exithandler ) + +def __enableReadlineSupport(): + readline.parse_and_bind("tab: complete") + try: + readline.read_history_file( "/tmp/python-history-file.txt" ) + except IOError: + pass + +def __enableDefaultEncoding(): + import sys + try: + sys.setdefaultencoding('utf8') + except LookupError: + pass + +import sys +try: + import rlcompleter, readline +except ImportError: + sys.stderr.write( "Python %s (OpenEmbedded build) sitecustomize.py not active. Please install python-readline.\n" % sys.version.split()[0] ) +else: + __enableDefaultEncoding() + __registerExitHandler() + __enableReadlineSupport() + sys.stderr.write( "Python %s (OpenEmbedded build) sitecustomize.py active.\n" % sys.version.split()[0] ) diff --git a/packages/python/python_2.5.1.bb b/packages/python/python_2.5.1.bb index 37f7bdefb8..b274b0d7f9 100644 --- a/packages/python/python_2.5.1.bb +++ b/packages/python/python_2.5.1.bb @@ -7,7 +7,7 @@ DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" # NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py -PR = "ml6" +PR = "ml7" PYTHON_MAJMIN = "2.5" @@ -18,7 +18,8 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ file://autohell.patch;patch=1 \ file://sitebranding.patch;patch=1 \ file://enable-ctypes-module.patch;patch=1 \ - file://default-is-optimized.patch;patch=1" + file://default-is-optimized.patch;patch=1 \ + file://sitecustomize.py" S = "${WORKDIR}/Python-${PV}" inherit autotools @@ -44,21 +45,21 @@ do_compile_prepend() { } do_compile() { - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - OPT="${CFLAGS}" libpython2.5.so + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + OPT="${CFLAGS}" libpython2.5.so oe_libinstall -so libpython2.5 ${STAGING_LIBDIR} oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - OPT="${CFLAGS}" + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + OPT="${CFLAGS}" } do_stage() { @@ -68,12 +69,15 @@ do_stage() { do_install() { install -m 0644 Makefile.orig Makefile - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - DESTDIR=${D} LIBDIR=${libdir} install + + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + DESTDIR=${D} LIBDIR=${libdir} install + + install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN} } require python-${PYTHON_MAJMIN}-manifest.inc @@ -81,6 +85,10 @@ require python-${PYTHON_MAJMIN}-manifest.inc RPROVIDES_python-core = "python" RRECOMMENDS_python-core = "python-readline" +# add sitecustomize +FILES_python-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py" + +# package libpython PACKAGES =+ "libpython2" FILES_libpython2 = "${libdir}/libpython*" diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index 63d314c6c5..ba2a037f59 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -8,13 +8,6 @@ NONDEV_PACKAGES += "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network ${QT_BASE_NAME}-demos ${QT_BASE_NAME}-examples \ ${QT_BASE_NAME}-linguist \ ${QT_BASE_NAME}-pixeltool ${QT_BASE_NAME}-dbus \ - ${QT_BASE_NAME}-plugins-accessible \ - ${QT_BASE_NAME}-plugins-codecs \ - ${QT_BASE_NAME}-plugins-designer \ - ${QT_BASE_NAME}-plugins-imageformats \ - ${QT_BASE_NAME}-plugins-sqldrivers \ - ${QT_BASE_NAME}-plugins-inputmethods \ - ${QT_BASE_NAME}-plugins-iconengines \ ${QT_BASE_NAME}-fonts " DEV_PACKAGES += "${QT_BASE_LIB}core4-dev \ @@ -46,7 +39,7 @@ DBG_PACKAGES += "${QT_BASE_LIB}core4-dbg \ ${QT_BASE_LIB}assistantclient4-dbg \ ${QT_BASE_LIB}script4-dbg \ ${QT_BASE_LIB}dbus4-dbg \ - ${QT_BASE_LIB}opengl4-dbg " + ${QT_BASE_LIB}opengl4-dbg" PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES} ${DBG_PACKAGES}" @@ -54,7 +47,7 @@ PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES} ${DBG_PACKAGES}" ALLOW_EMPTY_${PN} = "1" FILES_${PN} = "" FILES_${PN}-dev = " ${includedir}/${QT_DIR_NAME}/Qt/*" -FILES_${PN}-dbg = "${bindir}/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/*/.debug/*.so" +FILES_${PN}-dbg = "${bindir}/*/.debug " RDEPENDS_${PN} = "${NONDEV_PACKAGES}" RDEPENDS_${PN}-dev = "${DEV_PACKAGES}" RDEPENDS_${PN}-dbg = "${DBG_PACKAGES}" @@ -112,14 +105,6 @@ FILES_${QT_BASE_LIB}opengl4-dbg = "${libdir}/.debug/libQtOpenGL*" FILES_${QT_BASE_LIB}uitools4-dev = "${libdir}/libQtUiTools* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/QtUiTools${QT_LIBINFIX}.pc" -FILES_${QT_BASE_NAME}-plugins-accessible = "${libdir}/${QT_DIR_NAME}/plugins/accessible/*.so" -FILES_${QT_BASE_NAME}-plugins-codecs = "${libdir}/${QT_DIR_NAME}/plugins/codecs/*.so" -FILES_${QT_BASE_NAME}-plugins-designer = "${libdir}/${QT_DIR_NAME}/plugins/designer/*.so" -FILES_${QT_BASE_NAME}-plugins-imageformats = "${libdir}/${QT_DIR_NAME}/plugins/imageformats/*.so" -FILES_${QT_BASE_NAME}-plugins-sqldrivers = "${libdir}/${QT_DIR_NAME}/plugins/sqldrivers/*.so" -FILES_${QT_BASE_NAME}-plugins-inputmethods = "${libdir}/${QT_DIR_NAME}/plugins/inputmethods/*.so" -FILES_${QT_BASE_NAME}-plugins-iconengines = "${libdir}/${QT_DIR_NAME}/plugins/iconengines/*.so" - FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant*" FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*" FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts" @@ -133,8 +118,52 @@ FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo ${bindir}/${QT_DI FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts" python populate_packages_prepend() { - translationdir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d) - do_split_packages(d, translationdir, '^qt_(.*)\.qm$', '${QT_DIR_NAME}-translation-%s', '{PN} translation for %s', extra_depends='' ) + translation_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d) + translation_name = bb.data.expand('${QT_BASE_NAME}-translation-%s', d) + do_split_packages(d, translation_dir, '^qt_(.*)\.qm$', translation_name, '{PN} translation for %s', extra_depends='' ) + + phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d) + phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d) + do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '{PN} phrasebook for %s', extra_depends='' ) + + # Package all the plugins and their -dbg version and create a meta package + import os + def qtopia_split(path, name, glob): + """ + Split the package into a normal and -dbg package and then add the + new packages to the meta package. + """ + plugin_dir = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/' % path, d) + if not os.path.exists("%s%s" % (bb.data.expand('${D}',d), plugin_dir)): + bb.note("The path does not exist:", bb.data.expand('${D}', d), plugin_dir) + return + + plugin_name = bb.data.expand('${QT_BASE_NAME}-plugin-%s-%%s' % name, d) + dev_packages = [] + dev_hook = lambda file,pkg,b,c,d:dev_packages.append((file,pkg)) + do_split_packages(d, plugin_dir, glob, plugin_name, '{PN} %s for %%s' % name, extra_depends='', hook=dev_hook) + # Create a -dbg package as well + plugin_dir_dbg = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug' % path, d) + packages = bb.data.getVar('PACKAGES',d) + for (file,package) in dev_packages: + packages = "%s %s-dbg" % (packages, package) + file_name = os.path.join(plugin_dir_dbg, os.path.basename(file)) + bb.data.setVar("FILES_%s-dbg" % package, file_name, d) + bb.data.setVar("DESCRIPTION_%s-dbg" % package, "{PN} %s for %s" % (name, package), d) + + bb.data.setVar('PACKAGES', packages, d) + + qtopia_split('accessible', 'accessible', '^libq(.*)\.so$') + qtopia_split('codecs', 'codec', '^libq(.*)\.so$') + qtopia_split('decorations', 'decoration', '^libqdecoration(.*)\.so$') + qtopia_split('designer', 'designer', '^lib(.*)\.so$') + qtopia_split('gfxdrivers', 'gfxdriver', '^libqgfx(.*)\.so$') + qtopia_split('mousedrivers','mousedriver', '^libq(.*)mousedriver\.so$') + qtopia_split('iconengines', 'iconengine', '^libq(.*)\.so$') + qtopia_split('imageformats','imageformat', '^libq(.*)\.so$') + qtopia_split('inputmethods','inputmethod', '^libq(.*)\.so$') + qtopia_split('sqldrivers', 'sqldriver', '^libq(.*)\.so$') + qtopia_split('styles', 'style', '^libq(.*)\.so$') } |