summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--classes/kernel.bbclass2
-rw-r--r--packages/fontconfig/fontconfig.inc37
-rw-r--r--packages/fontconfig/fontconfig_2.2.95.bb41
-rw-r--r--packages/fontconfig/fontconfig_2.3.91.bb41
-rw-r--r--packages/fontconfig/fontconfig_2.3.95.bb39
-rw-r--r--packages/fontconfig/fontconfig_2.4.1.bb38
-rw-r--r--packages/images/qtopia-core-gui-image.bb20
-rw-r--r--packages/linux/linux_2.6.23.bb4
-rw-r--r--packages/tasks/task-qtopia-core-gui.bb11
-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, 84 insertions, 149 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/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/images/qtopia-core-gui-image.bb b/packages/images/qtopia-core-gui-image.bb
new file mode 100644
index 0000000000..6f3e594e62
--- /dev/null
+++ b/packages/images/qtopia-core-gui-image.bb
@@ -0,0 +1,20 @@
+#QtopiaCore 'console' image
+#gives you a small images with ssh access
+
+ANGSTROM_EXTRA_INSTALL ?= ""
+DISTRO_SSH_DAEMON ?= "dropbear"
+DEPENDS = "task-boot task-qtopia-core-gui task-qtopia-core-gui"
+
+IMAGE_INSTALL = "task-boot \
+ util-linux-mount util-linux-umount \
+ ${DISTRO_SSH_DAEMON} \
+ angstrom-version \
+ task-qtopia-core-console \
+ task-qtopia-core-gui \
+ "
+
+export IMAGE_BASENAME = "trolltech-qtopia-core-gui-image"
+IMAGE_LINGUAS = ""
+
+inherit image
+
diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb
index 640e3533bd..c143e1dbf9 100644
--- a/packages/linux/linux_2.6.23.bb
+++ b/packages/linux/linux_2.6.23.bb
@@ -39,9 +39,7 @@ SRC_URI_append_cm-x270 = "\
SRC_URI_append_mpc8313e-rdb = "\
file://mpc831x-nand.patch;patch=1 \
file://mpc8313e-rdb-leds.patch;patch=1 \
- file://mpc8313e-rdb-rtc.patch;patch=1 \
- file://defconfig-rt"
-
+ file://mpc8313e-rdb-rtc.patch;patch=1"
SRC_URI_append_mpc8323e-rdb = "\
file://mpc832x-leds.patch;patch=1"
diff --git a/packages/tasks/task-qtopia-core-gui.bb b/packages/tasks/task-qtopia-core-gui.bb
new file mode 100644
index 0000000000..5b5e467305
--- /dev/null
+++ b/packages/tasks/task-qtopia-core-gui.bb
@@ -0,0 +1,11 @@
+HOMEPAGE = "http://www.trolltech.com"
+LICENSE = "MIT"
+
+inherit task
+
+DESCRIPTION_task-qtopia-core-gui = "QtopiaCore GUI library"
+RDEPENDS_task-qtopia-core-gui = " \
+ task-qtopia-core-console \
+ libqtopiacoregui4 \
+ libqtopiacorescript4 \
+ libqtopiacoredbus4"
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 15:27:58 +0000