diff options
-rw-r--r-- | conf/distro/openzaurus-3.5.3.conf | 13 | ||||
-rw-r--r-- | packages/ipkg/ipkg-native_0.99.146.bb | 16 | ||||
-rw-r--r-- | packages/ipkg/ipkg_0.99.146.bb | 54 | ||||
-rw-r--r-- | packages/meta/meta-opie.bb | 5 | ||||
-rw-r--r-- | packages/tslib/tslib/akita/tslib.sh | 0 | ||||
-rw-r--r-- | packages/tslib/tslib/spitz/tslib.sh | 0 | ||||
-rw-r--r-- | packages/tslib/tslib_cvs.bb | 4 |
7 files changed, 81 insertions, 11 deletions
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf index bb383a3944..45ad0b9c67 100644 --- a/conf/distro/openzaurus-3.5.3.conf +++ b/conf/distro/openzaurus-3.5.3.conf @@ -1,10 +1,10 @@ include conf/distro/openzaurus.conf DISTRO = "openzaurus" DISTRO_NAME = "OpenZaurus" -# DISTRO_VERSION = "3.5.2-snapshot-${DATE}" -DISTRO_VERSION = "3.5.3" -# DISTRO_TYPE = "debug" -DISTRO_TYPE = "release" +DISTRO_VERSION = "3.5.2-snapshot-${DATE}" +# DISTRO_VERSION = "3.5.3" +DISTRO_TYPE = "debug" +# DISTRO_TYPE = "release" FEED_URIS += " \ upgrades##http://openzaurus.org/official/unstable/3.5.3/upgrades/ \ @@ -13,7 +13,7 @@ FEED_URIS += " \ console##http://openzaurus.org/official/unstable/3.5.3/feed/console \ devel##http://openzaurus.org/official/unstable/3.5.3/feed/devel" -CVSDATE = "20050326" +CVSDATE = "20050331" # # Zaurus @@ -21,7 +21,7 @@ CVSDATE = "20050326" ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95" OEINCLUDELOGS = "yes" -KERNEL_CONSOLE = "ttyS0" +KERNEL_CONSOLE = "tty1" #DEBUG_OPTIMIZATION = "-O -g3" #DEBUG_BUILD = "1" #INHIBIT_PACKAGE_STRIP = "1" @@ -34,6 +34,7 @@ PREFERRED_VERSION_binutils-cross = "2.15.94.0.1" 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" + # # Opie # diff --git a/packages/ipkg/ipkg-native_0.99.146.bb b/packages/ipkg/ipkg-native_0.99.146.bb index e69de29bb2..8886d44679 100644 --- a/packages/ipkg/ipkg-native_0.99.146.bb +++ b/packages/ipkg/ipkg-native_0.99.146.bb @@ -0,0 +1,16 @@ +SECTION = "base" +include ipkg_${PV}.bb + +# NOTE: ipkg now obeys ${libdir}, so ipkg-native now installs +# things into the wrong location inside of offline_root. Backup +# the target libdir and use that. +target_libdir := "${libdir}" +DEFAULT_PREFERENCE=-1 + +inherit native + +EXTRA_OECONF += "--with-ipkgdir=${target_libdir}/ipkg" + +DEPENDS = "libtool-native automake-native" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-${PV}" +PROVIDES = "" diff --git a/packages/ipkg/ipkg_0.99.146.bb b/packages/ipkg/ipkg_0.99.146.bb index e69de29bb2..6d5d4e74ef 100644 --- a/packages/ipkg/ipkg_0.99.146.bb +++ b/packages/ipkg/ipkg_0.99.146.bb @@ -0,0 +1,54 @@ +SECTION = "base" +DESCRIPTION = "Itsy Package Manager" +DESCRIPTION_libipkg = "Itsy Package Manager Library" +LICENSE = "GPL" +PROVIDES = "virtual/ipkg libipkg" +PR = "r2" + +DEFAULT_PREFERENCE=-1 + +PACKAGES =+ "libipkg-dev libipkg" +FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" +FILES_libipkg = "${libdir}" +AUTO_LIBNAME_PKGS = "libipkg" + +SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://terse.patch;patch=1" + +S = "${WORKDIR}/ipkg/C" + +inherit autotools pkgconfig + +pkg_postinst_ipkg () { +#!/bin/sh +if [ "x$D" != "x" ]; then + install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d + # this happens at S98 where our good 'ole packages script used to run + echo -e "#!/bin/sh +ipkg-cl configure +" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure + chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure +fi + +update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100 +} + +pkg_postrm_ipkg () { +#!/bin/sh +update-alternatives --remove ipkg ${bindir}/ipkg-cl +} + +do_stage() { + oe_libinstall -so libipkg ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/replace/ + install -m 0644 replace/replace.h ${STAGING_INCDIR}/replace/ + install -d ${STAGING_INCDIR}/libipkg/ + for f in *.h + do + install -m 0644 $f ${STAGING_INCDIR}/libipkg/ + done +} + +# +# FIXME: Install /etc/ipkg.conf and /etc/ipkg/arch.conf +# diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb index 8b736fc902..05095abd8f 100644 --- a/packages/meta/meta-opie.bb +++ b/packages/meta/meta-opie.bb @@ -1,8 +1,7 @@ DESCRIPTION = "Meta-package for Opie and QPE" -MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" SECTION = "opie/base" ALLOW_EMPTY = 1 -PR = "r22" +PR = "r23" PACKAGE_ARCH = "all" LICENSE = "MIT" @@ -124,7 +123,7 @@ poqetpresenter \ portabase \ qpdf2 \ qpealarmclock \ -qpe-gaim1 \ +qpe-gaim \ qpegps \ qpenmapfe \ qplot \ diff --git a/packages/tslib/tslib/akita/tslib.sh b/packages/tslib/tslib/akita/tslib.sh new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/tslib/tslib/akita/tslib.sh diff --git a/packages/tslib/tslib/spitz/tslib.sh b/packages/tslib/tslib/spitz/tslib.sh new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/tslib/tslib/spitz/tslib.sh diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb index 54b1b404be..e731699aee 100644 --- a/packages/tslib/tslib_cvs.bb +++ b/packages/tslib/tslib_cvs.bb @@ -1,7 +1,7 @@ SECTION = "base" DESCRIPTION = "tslib is a touchscreen access library." PV = "0.0cvs${CVSDATE}" -PR = "r17" +PR = "r18" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" PACKAGE_ARCH_tslib-conf = "${MACHINE}" @@ -47,7 +47,7 @@ do_install_append() { done rm -f ${D}${sysconfdir}/ts.conf ;; - c7x0) + c7x0 | spitz | akita) install -d ${D}${datadir}/tslib for f in ts.conf-corgi ts.conf-corgi-2.4; do install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ |