summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/chinook-compat.conf3
-rw-r--r--packages/libxml/libxml2.inc29
-rw-r--r--packages/libxml/libxml2_2.6.27.bb3
-rw-r--r--packages/libxml/libxml2_2.6.29.bb30
4 files changed, 35 insertions, 30 deletions
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index 581d4f31d0..f0e1ec2ad8 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -87,8 +87,7 @@ PREFERRED_VERSION_gtk+ = "2.10.14"
PREFERRED_VERSION_gnome-vfs = "2.16"
# 3.9.1 would be correct
PREFERRED_VERSION_gtkhtml-3.8 = "3.8.2"
-# 2.6.27 would be correct
-PREFERRED_VERSION_libxml = "2.6.29"
+PREFERRED_VERSION_libxml2 = "2.6.27"
# 2.16 would be correct
PREFERRED_VERSION_gconf = "2.6.1"
diff --git a/packages/libxml/libxml2.inc b/packages/libxml/libxml2.inc
new file mode 100644
index 0000000000..3f83f76ed5
--- /dev/null
+++ b/packages/libxml/libxml2.inc
@@ -0,0 +1,29 @@
+DESCRIPTION = "GNOME XML Parser library"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "MIT"
+
+SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz"
+
+inherit autotools pkgconfig binconfig
+
+EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
+
+export LDFLAGS += "-ldl"
+
+do_stage() {
+ autotools_stage_all
+ install -d ${STAGING_DATADIR}/aclocal/
+ install -d ${STAGING_BINDIR_CROSS}
+
+ install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
+ #this is need it by php during its install
+ install -m 0755 xml2-config ${STAGING_BINDIR_CROSS}
+}
+
+DEBIANNAME_${PN} = "libxml2"
+
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dev += "${bindir}/*-config"
+FILES_${PN}-utils += "${bindir}/*"
diff --git a/packages/libxml/libxml2_2.6.27.bb b/packages/libxml/libxml2_2.6.27.bb
new file mode 100644
index 0000000000..2a85ce8956
--- /dev/null
+++ b/packages/libxml/libxml2_2.6.27.bb
@@ -0,0 +1,3 @@
+# You want this old version for compatibility with Maemo OS2008.
+require libxml2.inc
+
diff --git a/packages/libxml/libxml2_2.6.29.bb b/packages/libxml/libxml2_2.6.29.bb
index 6f1c8632b1..b366a8278c 100644
--- a/packages/libxml/libxml2_2.6.29.bb
+++ b/packages/libxml/libxml2_2.6.29.bb
@@ -1,30 +1,4 @@
-DESCRIPTION = "GNOME XML Parser library"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "MIT"
-PR = "r5"
-
-SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz"
-
-inherit autotools pkgconfig binconfig
-
-EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
-
-export LDFLAGS += "-ldl"
+require libxml2.inc
-do_stage() {
- autotools_stage_all
- install -d ${STAGING_DATADIR}/aclocal/
- install -d ${STAGING_BINDIR_CROSS}
-
- install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
- #this is need it by php during its install
- install -m 0755 xml2-config ${STAGING_BINDIR_CROSS}
-}
-
-DEBIANNAME_${PN} = "libxml2"
-
-PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+PR = "r5"
-FILES_${PN}-dev += "${bindir}/*-config"
-FILES_${PN}-utils += "${bindir}/*"