familiar: rework feed handling. add config files for v0.8.4(-rc*).familiar-v0.8.4-rc2.3-tagfamiliar-v0.8.4-rc2.3

6 files changed, 165 insertions, 6 deletions

diff --git a/org.handhelds.familiar/classes/image_ipk.bbclass b/org.handhelds.familiar/classes/image_ipk.bbclass
index 5fdd340..37d4b33 100644
--- a/org.handhelds.familiar/classes/image_ipk.bbclass
+++ b/org.handhelds.familiar/classes/image_ipk.bbclass
@@ -53,6 +53,32 @@ fakeroot do_rootfs () {
 	${IMAGE_POSTPROCESS_COMMAND}
 }
 
+DISTRO_LOCALE_FEEDS_PREFIXES ?= ""
+DISTRO_LOCALE_FEEDS_HEADER ?= ""
+
+python __anonymous() {
+	prefixes = bb.data.getVar("DISTRO_LOCALE_FEEDS_PREFIXES", d, 1).split()
+	locale_feeds = bb.data.getVar("DISTRO_LOCALE_FEEDS_HEADER", d, 1)
+
+	# add template
+	locale_feeds += "# For each supported locale there is a subfeed in each of the feed folders.\n"
+	locale_feeds += "# You can use your webbrowser to check for valid locale codes.\n\n"
+	locale_feeds += "# To point ipkg at packages for your locale, replace <my_locale> with the\n"
+	locale_feeds += "# locale code in the template below and remove the leading '#' characters.\n\n"
+	for p in prefixes:
+		locale_feeds += "# src/gz %s-locale-<my_locale> %s/locale/<my_locale>\n" % (p.split('/')[-1], p)
+	
+	# add feed for each IMAGE_LINGUA
+	linguas = bb.data.getVar("IMAGE_LINGUAS", d, 1).split()
+	for l in linguas:
+		fst = l.split('-')[0]
+		locale_feeds += "\n# %s locale feeds\n" % fst
+		for p in prefixes:
+			locale_feeds += "src/gz %s-locale-%s %s/locale/%s\n" % (p.split('/')[-1], fst, p, fst)
+	
+	bb.data.setVar("DISTRO_LOCALE_FEEDS", locale_feeds, d)
+}
+
 insert_feed_uris () {
 	
 	echo "Building feeds for [${DISTRO}].."
@@ -69,4 +95,14 @@ insert_feed_uris () {
 		# insert new feed-sources
 		echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg/${feed_name}-feed.conf
 	done			
+
+	if [ -z ${FEED_URIS} ]; then
+cat > ${IMAGE_ROOTFS}/etc/ipkg/${DISTRO}-${DISTRO_VERSION}-feeds.conf <<EOF
+${DISTRO_FEEDS}
+EOF
+
+cat > ${IMAGE_ROOTFS}/etc/ipkg/${DISTRO}-${DISTRO_VERSION}-locale-feeds.conf <<EOF
+${DISTRO_LOCALE_FEEDS}
+EOF
+	fi
 }
diff --git a/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf b/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf
new file mode 100644
index 0000000..26a1c49
--- /dev/null
+++ b/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf
@@ -0,0 +1,84 @@
+DISTRO = "familiar"
+DISTRO_NAME = "Familiar Linux"
+DISTRO_VERSION = "v0.8.4-rc2"
+
+include conf/distro/familiar.conf
+include conf/distro/familiar-feeds.inc
+
+
+DISTRO_TYPE = "release"
+
+
+CVSDATE = 20051212
+
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+PREFERRED_PROVIDER_virtual/libiconv=glibc
+PREFERRED_PROVIDER_virtual/libintl=glibc
+PREFERRED_PROVIDER_x11=diet-x11
+
+#newer hostap modules didn't seem to work for me 
+PREFERRED_VERSION_hostap-modules ?= "0.3.9"
+
+#2.4 machines prefer 0.13e ones
+PREFERRED_VERSION_orinoco-modules ?= "0.13e"
+
+#but 0.13e doesn't build against 2.6
+PREFERRED_VERSION_orinoco-modules_h2200 ?= "0.15"
+PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15"
+
+#prefer a newer hh.org cvs kernel
+CVSDATE_handhelds-pxa-2.6 = "20051221"
+CVSDATE_LAB-kernel = "20051221"
+
+#The CSL compiler is unusable because
+# 1) certain programs stop to compile
+# 2) more programs segfault
+PREFERRED_VERSION_gcc ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross-sdk ?= "3.4.4"
+
+
+#
+# Machines section
+#
+
+# select kernel version for the zaurus family
+
+ZKERNEL_VERSION_poodle = "2.4" 
+ZKERNEL_VERSION_collie = "2.4"
+ZKERNEL_VERSION_c7x0   = "2.6"
+ZKERNEL_VERSION_spitz  = "2.4"
+ZKERNEL_VERSION_akita  = "2.4"
+ZKERNEL_VERSION_borzoi = "2.4"
+ZKERNEL_VERSION_tosa   = "2.4" 
+
+
+#
+# Opie
+#
+
+PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
+PREFERRED_VERSION_qte = "2.3.10"
+
+OPIE_VERSION = "1.2.1"
+include conf/distro/preferred-opie-versions.inc
+
+#
+# GPE
+#
+
+PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
+PREFERRED_PROVIDER_x11 = "diet-x11"
+
+include conf/distro/preferred-gpe-versions-2.7.inc
+
+#
+# E
+#
+include conf/distro/preferred-e-versions.inc
+
diff --git a/org.handhelds.familiar/conf/distro/familiar-feeds.inc b/org.handhelds.familiar/conf/distro/familiar-feeds.inc
new file mode 100644
index 0000000..411c97e
--- /dev/null
+++ b/org.handhelds.familiar/conf/distro/familiar-feeds.inc
@@ -0,0 +1,24 @@
+DISTRO_FEED_PREFIX = "http://ftp.handhelds.org/distributions/familiar/releases/${DISTRO_VERSION}/feed"
+
+DISTRO_FEEDS_prepend () {
+# Familiar ${DISTRO_VERSION} feeds
+
+# base - essential packages
+src/gz base ${DISTRO_FEED_PREFIX}/base
+src/gz base-${MACHINE} ${DISTRO_FEED_PREFIX}/base/machine/${MACHINE}
+
+# updates - security and bugfix updates go in this feed
+src/gz updates ${DISTRO_FEED_PREFIX}/updates
+src/gz updates-${MACHINE} ${DISTRO_FEED_PREFIX}/updates/machine/${MACHINE}
+
+# common - additional packages not specific to any graphical environment
+src/gz common ${DISTRO_FEED_PREFIX}/common
+src/gz common-${MACHINE} ${DISTRO_FEED_PREFIX}/common/machine/${MACHINE}
+}
+
+DISTRO_LOCALE_FEEDS_PREFIXES = "${DISTRO_FEED_PREFIX}/base ${DISTRO_FEED_PREFIX}/updates ${DISTRO_FEED_PREFIX}/common"
+
+DISTRO_LOCALE_FEEDS_HEADER_prepend () {
+# Familiar ${DISTRO_VERSION} locale feeds
+
+}
diff --git a/org.handhelds.familiar/packages/konqueror/konqueror-embedded_20030705.bb b/org.handhelds.familiar/packages/konqueror/konqueror-embedded_20030705.bb
index e3fc55a..3b2d5ea 100644
--- a/org.handhelds.familiar/packages/konqueror/konqueror-embedded_20030705.bb
+++ b/org.handhelds.familiar/packages/konqueror/konqueror-embedded_20030705.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition"
 SECTION = "opie/applications"
 PRIORITY = "optional"
-DEPENDS = "libqpe-opie openssl pcre"
+DEPENDS = "libqpe-opie pcre"
 LICENSE = "LGPL/GPL"
 PR = "r3"
 
@@ -30,7 +30,7 @@ EXTRA_OECONF = '--prefix=${palmtopdir} --exec-prefix=${palmtopdir}
                 --enable-static --disable-shared --disable-debug                                \
                 --with-javascript=static --enable-qpe --enable-qt-embedded                      \
                 --with-extra-includes=${STAGING_INCDIR} --with-extra-libs=${STAGING_LIBDIR}     \
-                --with-ssl-version=0.9.7c --with-ssl-dir=${STAGING_LIBDIR}/..                   \
+                --without-ssl                                                                   \
                 --with-qt-dir=${QTDIR} --with-qtopia-dir=${OPIEDIR}                             \
 		--enable-libsuffix=""							        '
 
diff --git a/org.handhelds.familiar/packages/meta/gpe-image.bb b/org.handhelds.familiar/packages/meta/gpe-image.bb
index 3767611..7d37c4f 100644
--- a/org.handhelds.familiar/packages/meta/gpe-image.bb
+++ b/org.handhelds.familiar/packages/meta/gpe-image.bb
@@ -1,7 +1,15 @@
 FEED_URIS_append_openzaurus = " x11##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 "
 FEED_URIS_append_opensimpad = " x11##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
                                 gpe##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
-FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11"
+
+DISTRO_FEEDS_append_familiar () {
+
+# x11 - additional packages specific to the x11 graphical environment
+src/gz x11 ${DISTRO_FEED_PREFIX}/x11
+src/gz x11-${MACHINE} ${DISTRO_FEED_PREFIX}/x11/machine/${MACHINE}
+}
+
+DISTRO_LOCALE_FEEDS_PREFIXES_append_familiar = " ${DISTRO_FEED_PREFIX}/x11"
 
 PR = "r21"
 
@@ -55,7 +63,6 @@ export IPKG_INSTALL = "task-bootstrap gpe-task-base \
 		       ${XSERVER} \
 		       ${GPE_EXTRA_INSTALL}"
 
-IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp "
 ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
 
 inherit image_ipk
diff --git a/org.handhelds.familiar/packages/meta/opie-image.bb b/org.handhelds.familiar/packages/meta/opie-image.bb
index e012b2c..5c30876 100644
--- a/org.handhelds.familiar/packages/meta/opie-image.bb
+++ b/org.handhelds.familiar/packages/meta/opie-image.bb
@@ -3,7 +3,15 @@ export IMAGE_LINGUAS = ""
 
 FEED_URIS_append_openzaurus = " opie##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie"
 FEED_URIS_append_opensimpad = " opie##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie"
-FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie"
+
+DISTRO_FEEDS_append_familiar () {
+
+# opie - additional packages specific to the opie graphical environment
+src/gz opie ${DISTRO_FEED_PREFIX}/opie
+src/gz opie-${MACHINE} ${DISTRO_FEED_PREFIX}/opie/machine/${MACHINE}
+}
+
+DISTRO_LOCALE_FEEDS_PREFIXES_append_familiar = " ${DISTRO_FEED_PREFIX}/opie"
 
 LICENSE = "MIT"
 PR = "r19"
@@ -66,6 +74,6 @@ merge_feeds() {
 }
 
 # merge feed-sources into ipkg.conf and create /etc/timestamp from build date
-IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp"
+IMAGE_PREPROCESS_COMMAND = "merge_feeds; "
 
 inherit image_ipk