diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/fontconfig/fontconfig.inc | 37 | ||||
-rw-r--r-- | packages/fontconfig/fontconfig_2.2.95.bb | 41 | ||||
-rw-r--r-- | packages/fontconfig/fontconfig_2.3.91.bb | 41 | ||||
-rw-r--r-- | packages/fontconfig/fontconfig_2.3.95.bb | 39 | ||||
-rw-r--r-- | packages/fontconfig/fontconfig_2.4.1.bb | 38 | ||||
-rw-r--r-- | packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb | 68 | ||||
-rw-r--r-- | packages/linux/linux-openmoko-devel_svn+2.6.24-rc6.bb | 68 | ||||
-rw-r--r-- | packages/meta/external-toolchain.bb | 2 | ||||
-rw-r--r-- | packages/tasks/task-openmoko-toolchain-host.bb | 13 | ||||
-rw-r--r-- | packages/tzcode/tzcode-native_2007k.bb (renamed from packages/tzcode/tzcode-native_2007e.bb) | 0 | ||||
-rw-r--r-- | packages/tzdata/tzdata_2007k.bb (renamed from packages/tzdata/tzdata_2007e.bb) | 0 |
11 files changed, 51 insertions, 296 deletions
diff --git a/packages/fontconfig/fontconfig.inc b/packages/fontconfig/fontconfig.inc new file mode 100644 index 0000000000..2b3dc39c36 --- /dev/null +++ b/packages/fontconfig/fontconfig.inc @@ -0,0 +1,37 @@ +DESCRIPTION = "A library for configuring and customizing font access." +SECTION = "libs" +LICENSE = "BSD" +DEPENDS = "expat freetype freetype-native zlib" + +# Work around past breakage in debian.bbclass +RPROVIDES_fontconfig-utils = "libfontconfig-utils" +RREPLACES_fontconfig-utils = "libfontconfig-utils" +RCONFLICTS_fontconfig-utils = "libfontconfig-utils" +DEBIAN_NOAUTONAME_fontconfig-utils = "1" + +SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz" + +S = "${WORKDIR}/fontconfig-${PV}" + +inherit autotools pkgconfig + +export HASDOCBOOK="no" + +EXTRA_OECONF = " --disable-docs" +EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname" + +# The tarball has some of the patched files as read only, which +# patch doesn't like at all + +fontconfig_do_unpack() { + chmod -R u+rw ${S} +} + +python do_unpack () { + bb.build.exec_func('base_do_unpack', d) + bb.build.exec_func('fontconfig_do_unpack', d) +} + +PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " +FILES_fontconfig-utils-dbg = "${bindir}/*.dbg" +FILES_fontconfig-utils = "${bindir}/*" diff --git a/packages/fontconfig/fontconfig_2.2.95.bb b/packages/fontconfig/fontconfig_2.2.95.bb index e1cc319f16..d1aab24951 100644 --- a/packages/fontconfig/fontconfig_2.2.95.bb +++ b/packages/fontconfig/fontconfig_2.2.95.bb @@ -1,45 +1,12 @@ -SECTION = "libs" -LICENSE = "BSD" -DESCRIPTION = "A library for configuring and customizing font access." -DEPENDS = "expat freetype freetype-native zlib fontconfig-native" +require fontconfig.inc -SRC_URI = "http://freedesktop.org/fontconfig/release/fontconfig-${PV}.tar.gz \ - file://fc-glyphname.patch;patch=1 \ +DEPENDS += "fontconfig-native" + +SRC_URI += "file://fc-glyphname.patch;patch=1 \ file://fc-lang.patch;patch=1 \ file://local.conf" PR = "r8" -PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " -FILES_fontconfig-utils-dbg = "${bindir}/*.dbg" -FILES_fontconfig-utils = "${bindir}/*" - -# Work around past breakage in debian.bbclass -RPROVIDES_fontconfig-utils = "libfontconfig-utils" -RREPLACES_fontconfig-utils = "libfontconfig-utils" -RCONFLICTS_fontconfig-utils = "libfontconfig-utils" -DEBIAN_NOAUTONAME_fontconfig-utils = "1" - -S = "${WORKDIR}/fontconfig-${PV}" - -inherit autotools pkgconfig - -export HASDOCBOOK="no" - -EXTRA_OECONF = " --disable-docs " -EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname" - -# The tarball has some of the patched files as read only, which -# patch doesn't like at all - -fontconfig_do_unpack() { - chmod -R u+rw ${S} -} - -python do_unpack () { - bb.build.exec_func('base_do_unpack', d) - bb.build.exec_func('fontconfig_do_unpack', d) -} - do_stage () { oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/fontconfig diff --git a/packages/fontconfig/fontconfig_2.3.91.bb b/packages/fontconfig/fontconfig_2.3.91.bb index 220f11d1c9..ec6ef8e037 100644 --- a/packages/fontconfig/fontconfig_2.3.91.bb +++ b/packages/fontconfig/fontconfig_2.3.91.bb @@ -1,47 +1,14 @@ -SECTION = "libs" -LICENSE = "BSD" -DESCRIPTION = "A library for configuring and customizing font access." -DEPENDS = "expat freetype freetype-native zlib fontconfig-native" +require fontconfig.inc -SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ - file://fc-glyphname.patch;patch=1 \ +DEPENDS += "fontconfig-native" + +SRC_URI += "file://fc-glyphname.patch;patch=1 \ file://fc-lang.patch;patch=1 \ file://one-j-too-many.patch;patch=1 \ file://local.conf" PR = "r3" -PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " -FILES_fontconfig-utils-dbg = "${bindir}/*.dbg" -FILES_fontconfig-utils = "${bindir}/*" - -# Work around past breakage in debian.bbclass -RPROVIDES_fontconfig-utils = "libfontconfig-utils" -RREPLACES_fontconfig-utils = "libfontconfig-utils" -RCONFLICTS_fontconfig-utils = "libfontconfig-utils" -DEBIAN_NOAUTONAME_fontconfig-utils = "1" - -S = "${WORKDIR}/fontconfig-${PV}" - -inherit autotools pkgconfig - -export HASDOCBOOK="no" - -EXTRA_OECONF = " --disable-docs " -EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname" - -# The tarball has some of the patched files as read only, which -# patch doesn't like at all - -fontconfig_do_unpack() { - chmod -R u+rw ${S} -} - -python do_unpack () { - bb.build.exec_func('base_do_unpack', d) - bb.build.exec_func('fontconfig_do_unpack', d) -} - do_stage () { oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/fontconfig diff --git a/packages/fontconfig/fontconfig_2.3.95.bb b/packages/fontconfig/fontconfig_2.3.95.bb index adbd0ad558..035f8467ed 100644 --- a/packages/fontconfig/fontconfig_2.3.95.bb +++ b/packages/fontconfig/fontconfig_2.3.95.bb @@ -1,44 +1,9 @@ -SECTION = "libs" -LICENSE = "BSD" -DESCRIPTION = "A library for configuring and customizing font access." -DEPENDS = "expat freetype freetype-native zlib" +require fontconfig.inc -SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ - file://one-j-too-many.patch;patch=1" +SRC_URI += "file://one-j-too-many.patch;patch=1" PR = "r2" -PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " -FILES_fontconfig-utils-dbg = "${bindir}/*.dbg" -FILES_fontconfig-utils = "${bindir}/*" - -# Work around past breakage in debian.bbclass -RPROVIDES_fontconfig-utils = "libfontconfig-utils" -RREPLACES_fontconfig-utils = "libfontconfig-utils" -RCONFLICTS_fontconfig-utils = "libfontconfig-utils" -DEBIAN_NOAUTONAME_fontconfig-utils = "1" - -S = "${WORKDIR}/fontconfig-${PV}" - -inherit autotools pkgconfig - -export HASDOCBOOK="no" - -EXTRA_OECONF = " --disable-docs " -EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname" - -# The tarball has some of the patched files as read only, which -# patch doesn't like at all - -fontconfig_do_unpack() { - chmod -R u+rw ${S} -} - -python do_unpack () { - bb.build.exec_func('base_do_unpack', d) - bb.build.exec_func('fontconfig_do_unpack', d) -} - do_stage () { oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/fontconfig diff --git a/packages/fontconfig/fontconfig_2.4.1.bb b/packages/fontconfig/fontconfig_2.4.1.bb index cc64f9ec4c..0e6e008f42 100644 --- a/packages/fontconfig/fontconfig_2.4.1.bb +++ b/packages/fontconfig/fontconfig_2.4.1.bb @@ -1,42 +1,10 @@ -SECTION = "libs" -LICENSE = "BSD" -DESCRIPTION = "A library for configuring and customizing font access." -DEPENDS = "expat freetype freetype-native zlib" +require fontconfig.inc -SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ - https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h" PR = "r2" -PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " -FILES_fontconfig-utils-dbg = "${bindir}/*.dbg" -FILES_fontconfig-utils = "${bindir}/*" +SRC_URI += "https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h" -# Work around past breakage in debian.bbclass -RPROVIDES_fontconfig-utils = "libfontconfig-utils" -RREPLACES_fontconfig-utils = "libfontconfig-utils" -RCONFLICTS_fontconfig-utils = "libfontconfig-utils" -DEBIAN_NOAUTONAME_fontconfig-utils = "1" - -S = "${WORKDIR}/fontconfig-${PV}" - -inherit autotools pkgconfig - -export HASDOCBOOK="no" - -EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH}" -EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname" - -# The tarball has some of the patched files as read only, which -# patch doesn't like at all - -fontconfig_do_unpack() { - chmod -R u+rw ${S} -} - -python do_unpack () { - bb.build.exec_func('base_do_unpack', d) - bb.build.exec_func('fontconfig_do_unpack', d) -} +EXTRA_OECONF += " --with-arch=${HOST_ARCH}" do_stage () { cp ${WORKDIR}/device_symbols.h ${S}/fontconfig/ 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/meta/external-toolchain.bb b/packages/meta/external-toolchain.bb index 47d9a93a15..69f16b10df 100644 --- a/packages/meta/external-toolchain.bb +++ b/packages/meta/external-toolchain.bb @@ -15,7 +15,7 @@ PROVIDES = "\ virtual/linux-libc-headers \ " -RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++" +#RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++" PACKAGES_DYNAMIC = "glibc-gconv-*" PR = "r1" diff --git a/packages/tasks/task-openmoko-toolchain-host.bb b/packages/tasks/task-openmoko-toolchain-host.bb index 31ac3bb746..788152c6ca 100644 --- a/packages/tasks/task-openmoko-toolchain-host.bb +++ b/packages/tasks/task-openmoko-toolchain-host.bb @@ -11,16 +11,3 @@ PACKAGES = "${PN}" RDEPENDS_${PN} += "\ openmoko-sample2-src \ " -require task-sdk-host.bb - -DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain" -LICENSE = "MIT" -ALLOW_EMPTY = "1" - -PR = "r0" - -PACKAGES = "${PN}" - -RDEPENDS_${PN} += "\ - openmoko-sample2-src \ -" diff --git a/packages/tzcode/tzcode-native_2007e.bb b/packages/tzcode/tzcode-native_2007k.bb index 8e721d6d9a..8e721d6d9a 100644 --- a/packages/tzcode/tzcode-native_2007e.bb +++ b/packages/tzcode/tzcode-native_2007k.bb diff --git a/packages/tzdata/tzdata_2007e.bb b/packages/tzdata/tzdata_2007k.bb index d873bfd0d6..d873bfd0d6 100644 --- a/packages/tzdata/tzdata_2007e.bb +++ b/packages/tzdata/tzdata_2007k.bb |