summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--classes/package.bbclass3
-rw-r--r--packages/gcc/gcc-cross-sdk_3.3.4.bb43
-rw-r--r--packages/gnome/gconf-dbus_cvs.bb5
-rw-r--r--packages/meta/meta-sdk.bb13
-rw-r--r--packages/mozilla/firefox_1.0.6.bb2
-rw-r--r--packages/mozilla/minimo_cvs.bb2
-rw-r--r--packages/opie-taskbar/opie-taskbar/c7x0/opie85
-rwxr-xr-xpackages/opie-taskbar/opie-taskbar/opie2
-rw-r--r--packages/opie-taskbar/opie-taskbar_cvs.bb2
9 files changed, 137 insertions, 20 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass
index d6a2193404..90dfec9fa7 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -481,7 +481,8 @@ python package_do_pkgconfig () {
pkgconfig_needed[pkg] += exp.replace(',', ' ').split()
for pkg in packages.split():
- pkgs_file = os.path.join(shlibs_dir, pkg + ".pclist")
+ ppkg = bb.data.getVar("PKG_" + pkg, d, 1) or pkg
+ pkgs_file = os.path.join(shlibs_dir, ppkg + ".pclist")
if os.path.exists(pkgs_file):
os.remove(pkgs_file)
if pkgconfig_provided[pkg] != []:
diff --git a/packages/gcc/gcc-cross-sdk_3.3.4.bb b/packages/gcc/gcc-cross-sdk_3.3.4.bb
index 562f67114a..e298b1caa1 100644
--- a/packages/gcc/gcc-cross-sdk_3.3.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.3.4.bb
@@ -3,7 +3,11 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r1"
+PR = "r2"
+include gcc_${PV}.bb
+
+# Files for these are defined in the main gcc.oe
+#PACKAGES = "libgcc libstdc++ libg2c"
inherit autotools sdk
@@ -75,6 +79,39 @@ do_compile () {
oe_runmake CFLAGS_FOR_TARGET="-I${STAGING_TARGET_INCDIR}"
}
-do_install () {
- autotools_do_install
+#do_install () {
+# autotools_do_install
+#}
+
+python do_package() {
+ if bb.data.getVar('DEBIAN_NAMES', d, 1):
+ bb.data.setVar('PKG_libgcc', 'libgcc1', d)
+ bb.build.exec_func('package_do_package', d)
}
+
+do_install () {
+ oe_runmake 'DESTDIR=${D}' install
+
+ # Move libgcc_s into /lib
+ mkdir -p ${D}${base_libdir}
+ if [ "${BUILD_SYS}" == "${TARGET_SYS}" ]; then
+ # native builds drop one pathname component
+ mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir}
+ else
+ mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir}
+ fi
+
+ # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
+ TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'`
+ mkdir -p ${D}${TGT_LIBDIR}
+ mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${TGT_LIBDIR}
+ mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${TGT_LIBDIR}
+
+ # Manually run the target stripper since we won't get it run by
+ # the packaging.
+ if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
+ ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libstdc++.so.*
+ ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libg2c.so.*
+ ${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.*
+ fi
+} \ No newline at end of file
diff --git a/packages/gnome/gconf-dbus_cvs.bb b/packages/gnome/gconf-dbus_cvs.bb
index 71ff770f52..a403fae24c 100644
--- a/packages/gnome/gconf-dbus_cvs.bb
+++ b/packages/gnome/gconf-dbus_cvs.bb
@@ -4,10 +4,11 @@ DESCRIPTION = "Settings daemon using DBUS for communication."
LICENSE = "GPL"
MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
PROVIDES = "gconf"
-RPROVIDES = "gconf"
+RPROVIDES_${PN} = "gconf"
+RPROVIDES_${PN}-dev = "gconf-dev"
PV = "0.0cvs${CVSDATE}"
-PR = "r5"
+PR = "r6"
SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gconf;tag=gconf-dbus-2-6 \
file://gconf-dbus-update.patch;patch=1;pnum=0 \
diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index 757c72ecb3..962572d546 100644
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -1,6 +1,7 @@
-PR = "r2"
+PR = "r3"
DEPENDS = "ipkg-native ipkg-utils-native binutils-cross-sdk gcc-cross-sdk gdb-cross fakeroot-native meta-gpe"
+DEPENDS += "libidl libsvg-cairo"
PACKAGES = ""
@@ -19,7 +20,7 @@ compositeext-dev \
damageext-dev \
dbus-dev \
fixesext-dev \
-gconf-dev \
+gconf-dbus-dev \
gtk+-dev \
gtk-engines-dev \
libapm-dev \
@@ -86,17 +87,15 @@ libxtst-dev \
libz-dev \
matchbox-desktop-dev \
ncurses-dev \
-orbit2-dev \
pango-dev \
randrext-dev \
recordext-dev \
renderext-dev \
resourceext-dev \
-rxvt-unicode-dev \
-wireless-tools-dev \
+libiw-dev \
xcalibrateext-dev \
xextensions-dev \
-xmu-dev \
+libxmu-dev \
xproto-dev \
xtrans-dev \
"
@@ -148,7 +147,7 @@ EOF
echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so
echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so
# remove unwanted housekeeping files
- mv ${SDK_OUTPUT}${libdir}/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
+ mv ${SDK_OUTPUT}${libdir}/../arm-linux/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
rm -rf ${SDK_OUTPUT}${libdir}/ipkg
# remove unwanted executables
diff --git a/packages/mozilla/firefox_1.0.6.bb b/packages/mozilla/firefox_1.0.6.bb
index 4a7b79454c..b3eeedcf64 100644
--- a/packages/mozilla/firefox_1.0.6.bb
+++ b/packages/mozilla/firefox_1.0.6.bb
@@ -8,8 +8,6 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/
S = "${WORKDIR}/mozilla"
-EXCLUDE_FROM_SHLIBS = "1"
-
inherit mozilla
include firefox.inc
diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb
index cb23f60255..917ff34019 100644
--- a/packages/mozilla/minimo_cvs.bb
+++ b/packages/mozilla/minimo_cvs.bb
@@ -14,8 +14,6 @@ FILES_${PN} += "${libdir}/mozilla-minimo"
PR = "r8"
LICENSE = "MPL/LGPL/GPL"
-EXCLUDE_FROM_SHLIBS = "1"
-
inherit mozilla
EXTRA_OECONF += "--enable-application=suite"
diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/opie b/packages/opie-taskbar/opie-taskbar/c7x0/opie
new file mode 100644
index 0000000000..dddb7caa0d
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar/c7x0/opie
@@ -0,0 +1,85 @@
+#!/bin/sh
+#
+[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
+[ -z $HOME ] && export HOME=/home/$LOGNAME
+
+# we need to tinker directly with qws_display until the ODevice
+# default (which is now W100:Rot0:0) works flawlessly with rotation
+# and survives a suspend/resume cycle
+export QWS_DISPLAY=Transformed:Rot0:0
+# export QWS_DISPLAY=W100:Rot0:0
+export QTDIR=/opt/QtPalmtop
+export OPIEDIR=/opt/QtPalmtop
+export QPEDIR=/opt/QtPalmtop
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
+export PATH=$PATH:$OPIEDIR/bin
+
+if [ ! -x "$OPIEDIR/bin/qpe" ] ; then
+ echo Opie not installed
+ exit 0
+fi
+
+. /etc/profile
+
+for conf in $OPIEDIR/etc/skel/*.conf; do
+ conf_basename=`basename $conf`
+ if [ ! -e "$HOME/Settings/$conf_basename" ] ; then
+ echo "Copying default $conf_basename into $HOME/Settings/"
+ mkdir -p $HOME/Settings/
+ cat $conf >$HOME/Settings/$conf_basename
+ fi
+done
+
+if [ ! -e "$HOME/systeminfo/linkver" ] ; then
+ mkdir -p $HOME/systeminfo/
+ echo "1.13" >$HOME/systeminfo/linkver
+fi
+
+if [ ! -e "/opt/Qtopia" ] ; then
+ ln -sf /opt/QtPalmtop /opt/Qtopia
+fi
+
+case $1 in
+'start')
+ /sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0
+
+ if [ -x "$OPIEDIR/bin/opie-login" ]; then
+ echo Starting Opie-login....
+ $OPIEDIR/bin/opie-login -terminal 2
+ else
+ $OPIEDIR/bin/opie-reorgfiles
+ if [ -x /usr/bin/ssh-agent ]; then
+ SSHAGENT=/usr/bin/ssh-agent
+ else
+ SSHAGENT=""
+ fi
+
+ if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then
+ export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
+ fi
+ echo Starting Opie....
+ $SSHAGENT $OPIEDIR/bin/qpe -terminal 2
+ fi
+
+ ;;
+
+'stop')
+ echo "Stopping Opie..."
+ killall qpe 2>/dev/null
+ killall opie-login 2>/dev/null
+ killall quicklauncher 2>/dev/null
+
+ ;;
+
+'restart')
+ $0 stop && $0 start
+
+ ;;
+
+*)
+ echo "usage: $0 { start | stop | restart }"
+
+ ;;
+
+esac
+
diff --git a/packages/opie-taskbar/opie-taskbar/opie b/packages/opie-taskbar/opie-taskbar/opie
index 88bfd4fd34..0d9452523e 100755
--- a/packages/opie-taskbar/opie-taskbar/opie
+++ b/packages/opie-taskbar/opie-taskbar/opie
@@ -3,13 +3,11 @@
[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
[ -z $HOME ] && export HOME=/home/$LOGNAME
-export QWS_DISPLAY=Transformed:Rot0:0
export QTDIR=/opt/QtPalmtop
export OPIEDIR=/opt/QtPalmtop
export QPEDIR=/opt/QtPalmtop
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
export PATH=$PATH:$OPIEDIR/bin
-# export QWS_KEYBOARD=KernelTTY
if [ ! -x "$OPIEDIR/bin/qpe" ] ; then
echo Opie not installed
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index f1fd277a9e..ad403c09f1 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,7 +1,7 @@
include ${PN}.inc
PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r5"
+PR = "r6"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-28 15:27:31 +0000