This commit brings my tree in line with Rene's tree for the familiar

0.8.4 release.

classes/autotools.bbclass

@@ -151,15 +151,32 @@ autotools_stage_includes() {
 }
 
 autotools_stage_all() {
-	if [ "${INHIBIT_AUTO_STAGE}" != "1" ]
+	if [ "${INHIBIT_AUTO_STAGE}" = "1" ]
 	then
-		rm -rf ${STAGE_TEMP}
-		mkdir -p ${STAGE_TEMP}
-		oe_runmake DESTDIR="${STAGE_TEMP}" install
-		cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
-		cp -pPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
-		rm -rf ${STAGE_TEMP}
+		return
+	fi
+	rm -rf ${STAGE_TEMP}
+	mkdir -p ${STAGE_TEMP}
+	oe_runmake DESTDIR="${STAGE_TEMP}" install
+	if [ -d ${STAGE_TEMP}/${includedir} ]; then
+		cp -fpPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
+	fi
+	if [ -d ${STAGE_TEMP}/${libdir} ]
+	then
+		for i in ${STAGE_TEMP}/${libdir}/*.la
+		do
+			if [ ! -f "$i" ]; then
+				cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
+				break
+			fi
+			oe_libinstall -so $(basename $i .la) ${STAGING_LIBDIR}
+		done
+	fi
+	if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then
+		install -d ${STAGING_DATADIR}/aclocal
+		cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
 	fi
+	rm -rf ${STAGE_TEMP}
 }
 
 EXPORT_FUNCTIONS do_configure do_install

classes/base.bbclass

@@ -171,9 +171,8 @@ oe_libinstall() {
 	if [ -z "$dir" ]; then
 		dir=`pwd`
 	fi
-	if [ -d "$dir/.libs" ]; then
-		dir=$dir/.libs
-	fi
+	dotlai=$libname.lai
+	dir=$dir`(cd $dir; find -name "$dotlai") | sed "s/^\.//;s/\/$dotlai\$//;q"`
 	olddir=`pwd`
 	__runcmd cd $dir
 
@@ -191,14 +190,13 @@ oe_libinstall() {
 	if [ -f "$dota" -o -n "$require_static" ]; then
 		__runcmd install -m 0644 $dota $destpath/
 	fi
-	dotlai=$libname.lai
 	if [ -f "$dotlai" -a -n "$libtool" ]; then
 		if test -n "$staging_install"
 		then
 			# stop libtool using the final directory name for libraries
 			# in staging:
 			__runcmd rm -f $destpath/$libname.la
-			__runcmd sed -e 's/^installed=yes$/installed=no/' $dotlai >$destpath/$libname.la
+			__runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' $dotlai >$destpath/$libname.la
 		else
 			__runcmd install -m 0644 $dotlai $destpath/$libname.la
 		fi

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
 }

classes/kernel.bbclass

@@ -185,6 +185,7 @@ fi
 }
 
 # autoload defaults (alphabetically sorted)
+module_autoload_evdev = "evdev"
 module_autoload_hidp = "hidp"
 module_autoload_ipv6 = "ipv6"
 module_autoload_ipsec = "ipsec"
@@ -231,12 +232,13 @@ python populate_packages_prepend () {
 		kernelver = bb.data.getVar('PV', d, 1) + bb.data.getVar('KERNEL_LOCALVERSION', d, 1)
 		kernelver_stripped = kernelver
 		m = re.match('^(.*-hh.*)[\.\+].*$', kernelver)
-		if m:
+		if m and not bb.data.getVar('KERNEL_PRESERVE_HH_MINOR_VER', d, 1):
 			kernelver_stripped = m.group(1)
 		path = bb.data.getVar("PATH", d, 1)
 		host_prefix = bb.data.getVar("HOST_PREFIX", d, 1) or ""
 
 		cmd = "PATH=\"%s\" %sdepmod -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, dvar, dvar, kernelver, kernelver_stripped)
+		bb.debug (1, cmd)
 		f = os.popen(cmd, 'r')
 
 		deps = {}
@@ -267,7 +269,9 @@ python populate_packages_prepend () {
 					m4 = re.match(pattern4, line)
 					deps[m2.group(1)].extend(m4.group(1).split())
 			line = f.readline()
-		f.close()
+		if f.close() or not deps:
+			# depmod returned an error or no deps found (very unlikely)
+			raise bb.build.FuncFailed("Failed to extract module dependencies.")
 		return deps
 
 	def get_dependencies(file, pattern, format):

classes/rootfs_ipk.bbclass

@@ -130,7 +130,13 @@ create_etc_timestamp() {
 	date +%2m%2d%2H%2M%Y >${IMAGE_ROOTFS}/etc/timestamp
 }
 
+make_zimage_symlink_relative () {
+	if [ -L ${IMAGE_ROOTFS}/boot/zImage ]; then
+		(cd ${IMAGE_ROOTFS}/boot/ && for i in `ls zImage-* | sort`; do ln -sf $i zImage; done)
+	fi
+}
+
 # export the zap_root_password and create_etc_timestamp
-EXPORT_FUNCTIONS zap_root_password create_etc_timestamp
+EXPORT_FUNCTIONS zap_root_password create_etc_timestamp make_zimage_symlink_relative
 
 addtask rootfs before do_build after do_install

conf/distro/familiar-0.8.3.conf

@@ -40,9 +40,6 @@ PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15"
 CVSDATE_handhelds-pxa-2.6 = "20051221"
 CVSDATE_LAB-kernel = "20051221"
 
-#gomunicator version which adds support for iPAQ h6300.
-CVSDATE_gomunicator = "20060518"
-
 #The CSL compiler is unusable because
 # 1) certain programs stop to compile
 # 2) more programs segfault

conf/distro/preferred-gpe-versions-2.7.inc

@@ -23,7 +23,7 @@ PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
 PREFERRED_VERSION_gtk+ ?= "2.6.10"
 PREFERRED_VERSION_pango ?= "1.8.1"
 PREFERRED_VERSION_librsvg ?= "2.6.5"
-PREFERRED_VERSION_libgpewidget ?= "0.109"
+PREFERRED_VERSION_libgpewidget ?= "0.112"
 PREFERRED_VERSION_libgpepimc ?= "0.6"
 PREFERRED_VERSION_libgpevtype ?= "0.15"
 PREFERRED_VERSION_libschedule ?= "0.15"
@@ -44,7 +44,7 @@ PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}"
 PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
 PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
 PREFERRED_VERSION_gpe-login ?= "0.86"
-PREFERRED_VERSION_gpe-session-scripts ?= "0.66"
+PREFERRED_VERSION_gpe-session-scripts ?= "0.67"
 PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
 PREFERRED_VERSION_gpe-todo ?= "0.55"
 PREFERRED_VERSION_gpe-calendar ?= "0.72"
@@ -57,7 +57,7 @@ PREFERRED_VERSION_gpe-beam ?= "0.2.8"
 PREFERRED_VERSION_gpe-bluetooth ?= "0.51"
 PREFERRED_VERSION_gpe-su ?= "0.19"
 PREFERRED_VERSION_gpe-conf ?= "0.1.30"
-PREFERRED_VERSION_gpe-clock ?= "0.23"
+PREFERRED_VERSION_gpe-clock ?= "0.25"
 PREFERRED_VERSION_gpe-mininet ?= "0.7"
 PREFERRED_VERSION_gpe-mixer ?= "0.42"
 PREFERRED_VERSION_gpe-shield ?= "0.9"
@@ -80,7 +80,7 @@ PREFERRED_VERSION_gpe-irc ?= "0.07"
 PREFERRED_VERSION_gpe-lights ?= "0.13"
 #PREFERRED_VERSION_gpe-nmf ?= "0.21"
 PREFERRED_VERSION_gpe-othello ?= "0.2-1"
-PREFERRED_VERSION_gpe-plucker ?= "0.2"
+PREFERRED_VERSION_gpe-plucker ?= "0.4"
 PREFERRED_VERSION_gpe-tetris ?= "0.6-4"
 PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
 PREFERRED_VERSION_xdemineur ?= "2.1.1"

conf/distro/preferred-gpe-versions.inc

@@ -41,7 +41,7 @@ PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
 #PREFERRED_VERSION_gpe-calendar ?= "0.61"
 #PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
 #PREFERRED_VERSION_gpe-contacts ?= "0.36"
-#PREFERRED_VERSION_gpe-today ?= "0.11"
+#PREFERRED_VERSION_gpe-today ?= "0.08"
 #PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
 PREFERRED_VERSION_dbus ?= "0.23.4"
 #PREFERRED_VERSION_gpe-bluetooth ?= "0.38"

conf/local.conf.sample

@@ -118,7 +118,7 @@ BBINCLUDELOGS = "yes"
 
 # Specifies a location to search for pre-generated tarballs when fetching
 # a cvs:// URI. Outcomment this, if you always want to pull directly from CVS.
-CVS_TARBALL_STASH = "http://www.oesources.org/source/current/"
+CVS_TARBALL_STASH = "http://familiar.handhelds.org/source/v0.8.4-rc2/sources/"
 
 # EDIT THIS FILE and then remove the line below before using!
 REMOVE_THIS_LINE:="${@oe.fatal('Read the comments in your conf/local.conf')}"

conf/machine/h2200.conf

@@ -39,3 +39,6 @@ GPE_EXTRA_DEPENDS += "gaim gpe-filemanager"
 GPE_EXTRA_INSTALL += "gaim gpe-filemanager"
 
 include conf/machine/tune-strongarm.conf
+
+# LAB can only resolve relative symlinks
+ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; "

conf/machine/ipaq-pxa270.conf

@@ -5,7 +5,7 @@
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm armv4 armv5te ipaqpxa hx4700"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
-PREFERRED_VERSIONS_handhelds-pxa-2.6 = "2.6.12-hh3"
+PREFERRED_VERSION_handhelds-pxa-2.6 = "2.6.15-hh1"
 
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
@@ -35,7 +35,7 @@ include conf/machine/tune-strongarm.conf
 
 BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
 HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
-                  hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power"
+                  hx4700_ts snd_hx4700_audio hx4700_power"
 
 module_autoload_hx4700_power = "hx4700_power"
 module_autoload_pcmcia = "pcmcia"

packages/apmd/apmd_3.2.2.bb

@@ -3,12 +3,11 @@ SECTION = "base"
 PRIORITY = "required"
 DEPENDS = "libtool-cross"
 LICENSE = "GPL"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz; \
            file://debian.patch;patch=1 \
            file://workaround.patch;patch=1 \
-           file://select-instead-of-sleep.patch;patch=1 \
            file://init \
            file://default \
            file://apmd_proxy \

packages/base-files/base-files/h6300/fstab

@@ -1,8 +1,8 @@
-rootfs       	/		auto	defaults	1  1
-proc            /proc		proc    defaults        0  0
-sys             /sys		sysfs	defaults        0  0
-tmpfs		/var		tmpfs	defaults	0  0
+rootfs         /               auto    defaults        1  1
+proc            /proc          proc    defaults        0  0
+sys             /sys           sysfs   defaults        0  0
+tmpfs          /var            tmpfs   defaults        0  0
 #The devpts file system provides an interface to pseudo terminal (pty) devices. 
-devpts		/dev/pts	devpts	mode=0620,gid=5	0  0
+devpts         /dev/pts        devpts  mode=0620,gid=5 0  0
 #Mount first partition from the mmc card.
-/dev/mmcblk0p1	/media/card	auto	defaults,sync,noauto,noatime,exec,suid	0  0
+/dev/mmcblk0p1 /media/card     auto    defaults,sync,noauto,noatime,exec,suid  0  0

packages/base-files/base-files_3.0.14.bb

@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r45"
+PR = "r46"
 LICENSE = "GPL"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"

packages/freetype/freetype_2.1.10.bb

@@ -2,10 +2,11 @@ DESCRIPTION = "Freetype font rendering library"
 HOMEPAGE = "http://www.freetype.org"
 SECTION = "libs"
 LICENSE = "freetype"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1"
+	   file://configure.patch;patch=1 \
+	   file://no-hardcode.patch;patch=1"
 S = "${WORKDIR}/freetype-${PV}"
 
 inherit autotools pkgconfig binconfig

packages/gnuz/gnuz_0.3.bb

@@ -5,14 +5,14 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 AUTHOR = "Lukas Fraser"
 HOMEPAGE = "http://gnuz.4cows.net/eraser/gnuz/"
-PR = "r2"
+PR = "r1"
 
 APPTYPE = "binary"
 APPNAME = "gnuz"
 APPDESKTOP = "${S}/data/"
 
 SRC_URI = "http://gnuz.4cows.net/eraser/gnuz/gnuz_0.3.tar.gz \
-           http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/gnuz-levels-0.3-1.tar.bz2"
+           http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/gnuz-levels-0.3.tar.bz2"
 
 S = "${WORKDIR}/gnuz"
 

packages/gpe-aerial/gpe-aerial_0.2.13.bb

@@ -1,6 +1,6 @@
 inherit gpe pkgconfig
 
-PR = "r0"
+PR = "r1"
 
 
 DESCRIPTION = "GPE wireless LAN communication applet"
@@ -10,3 +10,4 @@ SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
+SRC_URI += "file://iconlist.patch;patch=1;pnum=0"

packages/gpe-filemanager/gpe-filemanager_0.25.bb

@@ -1,12 +1,12 @@
 
 inherit gpe
 
-PR          = "r1"
+PR          = "r0"
 LICENSE     = "GPL"
 DESCRIPTION = "GPE file manager"
 DEPENDS     = "libgpewidget gnome-vfs dbus"
 SECTION     = "gpe"
 RDEPENDS    = "gpe-icons"
-RRECOMMENDS = "gnome-vfs-plugin-file gnome-vfs-plugin-smb gnome-vfs-plugin-ftp gnome-vfs-plugin-computer gnome-vfs-plugin-network gnome-vfs-plugin-sftp gnome-vfs-plugin-http"
+RRECOMMENDS = "gnome-vfs-plugin-file"
 
 FILES_${PN} += " ${datadir}/gpe"

packages/gpe-today/gpe-today_0.11.bb

@@ -1,12 +1,9 @@
+LICENSE = "GPL"
+inherit gpe
+
 DESCRIPTION = "Displays a summary of appointments and tasks for the day ahead"
 DEPENDS = "gtk+ libxrandr libxsettings libxsettings-client libgpewidget libdisplaymigration libeventdb libgpepimc libtododb"
 SECTION = "gpe"
 PRIORITY = "optional"
-MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
-
-LICENSE = "GPL"
-inherit gpe pkgconfig
-
-
-SRC_URI = "http://www.kernelconcepts.de/~fuchs/files/${P}.tar.gz"
 
+SRC_URI += "file://no-transparency.patch;patch=1"

packages/ipkg/ipkg-native_0.99.154.bb

@@ -1,2 +1,6 @@
 include ipkg_${PV}.bb
 include ipkg-native.inc
+
+PR = "r1"
+
+SRC_URI += "file://sw.patch;patch=1"

packages/ipkg/ipkg_0.99.159.bb

@@ -1,3 +1,6 @@
 include ipkg.inc
 
+PR = "r1"
+
 #SRC_URI += "file://interceptor.patch;patch=1;pnum=1"
+SRC_URI += "file://sw.patch;patch=1"

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=""							        '