Merge bk://openembedded@openembedded.bkbits.net/packages

into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/10/02 21:59:00+02:00 local!CoreDump
Merge bk://openembedded@openembedded.bkbits.net/packages
into mhcln01.hentges.local:/home/mhentges/OpenEmbedded/packages

2004/10/02 21:58:26+02:00 local!CoreDump
Add support for defining feed-URLs in *-image.oe files by setting FEED_URIS. The URLs will then be included as sources in ipkg.conf. See opie-image.oe for an example.

BKrev: 415f51d0CQqj8c3kxPUCSzuR6GctAw

3 files changed, 126 insertions, 1 deletions

diff --git a/classes/image_ipk.oeclass b/classes/image_ipk.oeclass
index 6d6a2b22e2..6c741b9cf3 100644
--- a/classes/image_ipk.oeclass
+++ b/classes/image_ipk.oeclass
@@ -31,6 +31,8 @@ fakeroot do_rootfs () {
 
 	real_do_rootfs
 
+	insert_feed_uris
+		
 	export TOPDIR=${TOPDIR}
 
 	for type in ${IMAGE_FSTYPES}; do
@@ -43,3 +45,37 @@ fakeroot do_rootfs () {
 
 	${IMAGE_POSTPROCESS_COMMAND}
 }
+
+insert_feed_uris () {
+
+	test -z "$FEED_URIS" && return 0
+	
+	# comment out existing feed-sources inserted by ipkg-collateral
+	cat ${IMAGE_ROOTFS}/etc/ipkg.conf | sed "s/^src\ /#src\ /" > ${IMAGE_ROOTFS}/etc/ipkg.conf_
+	rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf
+
+	# extract, then delete destinations
+	cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf.dest
+	cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep -v "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf_
+	rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf
+
+
+	for line in ${FEED_URIS}
+	do
+
+		# strip leading and trailing spaces/tabs, then split into name and uri
+		line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`"
+		feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`"
+		feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`"		
+
+		# insert new feed-sources
+		echo "src $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg.conf
+	done
+	
+	# remove temporary files and rebuild ipkg.conf
+	echo "" >> ${IMAGE_ROOTFS}/etc/ipkg.conf
+	cat ${IMAGE_ROOTFS}/etc/ipkg.conf.dest >> ${IMAGE_ROOTFS}/etc/ipkg.conf
+	rm ${IMAGE_ROOTFS}/etc/ipkg.conf.dest
+	
+	cp ${IMAGE_ROOTFS}/etc/ipkg.conf ${WORKDIR}
+}
diff --git a/meta/opie-image.oe b/meta/opie-image.oe
index e035ce1397..24c3f59603 100644
--- a/meta/opie-image.oe
+++ b/meta/opie-image.oe
@@ -1,6 +1,11 @@
 export IMAGE_BASENAME = "opie-image"
 export IMAGE_LINGUAS = ""
-PR = "r1"
+
+export FEED_URIS = "OZ-3.5.1##http://openzaurus.org/official/unstable/3.5.1/feed/ \
+		    OZ-Upgrades##http://openzaurus.org/official/unstable/3.5.1/upgrades/"
+
+
+PR = "r2"
 
 include opie-collections.oe
 
diff --git a/oz-compat/oz-compat_0.5.oe b/oz-compat/oz-compat_0.5.oe
index e69de29bb2..d71dcf2dfb 100644
--- a/oz-compat/oz-compat_0.5.oe
+++ b/oz-compat/oz-compat_0.5.oe
@@ -0,0 +1,84 @@
+SECTION = "opie/settings"
+DESCRIPTION = "Allows applications compiled with 2.95 to run on a 3.2 compiled \
+system by providing 2.95 libraries. To run compatible programs, use the Compat \
+Library program in the Settings menu to make them use these libraries."
+PRIORITY = "optional"
+MAINTAINER = "Tim Ansell <mithro AT mithis.net>"
+LICENSE = "GPL"
+
+PR = "r0"
+
+SRC_URI = "http://openzaurus.org/mirror/oz-compat_0.5.tar.gz \
+	   file://hentges.patch;patch=0"
+
+FILES_${PN} += "/opt /etc"
+PACKAGES = "oz-compat"
+
+RDEPENDS = "opie-sh"
+
+LEAD_SONAME = "libqte.so.*"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "quickexec"
+INITSCRIPT_PARAMS = "defaults 10"
+
+do_install() {
+	install -d ${D}/opt/QtPalmtop/apps/Settings
+	install -d ${D}/opt/QtPalmtop/bin/
+	install -d ${D}/opt/QtPalmtop/etc/
+	install -d ${D}/opt/QtPalmtop/pics/
+	
+	install -d ${D}/opt/QtPalmtop.compat/bin
+	install -d ${D}/opt/QtPalmtop.compat/binlib
+	install -d ${D}/opt/QtPalmtop.compat/lib
+	
+	install -d ${D}/etc/init.d
+	
+	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/apps/Settings/makecompat.desktop ${D}/opt/QtPalmtop/apps/Settings		
+	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/etc/quickexec.libs ${D}/opt/QtPalmtop/etc/quickexec.libs
+	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/pics/libraries.png ${D}/opt/QtPalmtop/pics/libraries.png
+	
+	install -m 0755 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop.compat/bin/* ${D}/opt/QtPalmtop.compat/bin
+	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop.compat/lib/* ${D}/opt/QtPalmtop.compat/lib
+	
+	install -m 0755 ${WORKDIR}/oz-compat-0.5/etc/init.d/quickexec ${D}/etc/init.d
+			
+	cd ${D}/opt/QtPalmtop/bin
+	for file in chkhinge makecompat qeserver quickexec runcompat
+	do
+		ln -s /opt/QtPalmtop.compat/bin/$file
+	done
+	
+	cd ${D}/opt/QtPalmtop.compat/lib
+	ln -s libqpe.so.1.5.0 libqpe.so.1.5
+	ln -s libqpe.so.1.5.0 libqpe.so.1
+	ln -s libqpe.so.1.5.0 libqpe.so
+	
+	ln -s libqte.so.2.3.7 libqte.so.2.3.2
+	ln -s libqte.so.2.3.7 libqte.so.2.3	
+	ln -s libqte.so.2.3.7 libqte.so.2
+	ln -s libqte.so.2.3.7 libqte.so
+		
+	
+}
+
+do_configure() {
+	rm ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop.compat/bin/*.patch
+}
+
+pkg_postinst() {
+test -n "$D" && exit 1
+
+# needed for update-rc.d
+test -e /mnt/card/etc/init.d/quickexec && ln -s /mnt/card/etc/init.d/quickexec /etc/init.d/quickexec
+test -e /mnt/cf/etc/init.d/quickexec && ln -s /mnt/cf/etc/init.d/quickexec /etc/init.d/quickexec
+test -e /mnt/ram/etc/init.d/quickexec && ln -s /mnt/ram/etc/init.d/quickexec /etc/init.d/quickexec
+}
+
+pkg_postrm() {
+	test -e /etc/init.d/quickexec && rm /etc/init.d/quickexec
+}
+
+
+