summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--classes/base.oeclass2
-rw-r--r--linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-tosa10
-rw-r--r--opie-taskbar/opie-taskbar_cvs.oe37
-rw-r--r--patcher/patcher-native.oe8
-rw-r--r--patcher/patcher-native_20040521.oe15
-rw-r--r--patcher/patcher-native_20040913.oe (renamed from patcher/patcher_20040521.oe)0
-rw-r--r--patcher/patcher.oe20
-rw-r--r--patcher/patcher_20040913.oe0
8 files changed, 33 insertions, 59 deletions
diff --git a/classes/base.oeclass b/classes/base.oeclass
index 85c8826fef..8c50abb2cd 100644
--- a/classes/base.oeclass
+++ b/classes/base.oeclass
@@ -318,7 +318,7 @@ python base_do_patch() {
cmd = "PATH=\"%s\" patcher" % oe.data.getVar("PATH", d, 1)
if "pnum" in parm:
cmd += " -p %s" % parm["pnum"]
- cmd += " -n \"%s\" -i %s" % (os.path.basename(efile), efile)
+ cmd += " -R -n \"%s\" -i %s" % (os.path.basename(efile), efile)
ret = os.system(cmd)
if ret != 0:
raise oe.build.FuncFailed("'patcher' execution failed")
diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-tosa b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-tosa
index 5dade995fb..df1bf11c7d 100644
--- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-tosa
+++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-tosa
@@ -370,14 +370,14 @@ CONFIG_PACKET_MMAP=y
CONFIG_NETLINK_DEV=y
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
-# CONFIG_FILTER is not set
+CONFIG_FILTER=y
CONFIG_UNIX=y
CONFIG_INET=y
# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
# CONFIG_ARPD is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
@@ -468,7 +468,7 @@ CONFIG_PPP_ASYNC=y
# CONFIG_PPP_SYNC_TTY is not set
# CONFIG_PPP_DEFLATE is not set
CONFIG_PPP_BSDCOMP=y
-# CONFIG_PPP_MPPE is not set
+CONFIG_PPP_MPPE=m
# CONFIG_PPPOE is not set
# CONFIG_SLIP is not set
@@ -534,7 +534,7 @@ CONFIG_IRDA=y
# IrDA protocols
#
# CONFIG_IRLAN is not set
-# CONFIG_IRNET is not set
+CONFIG_IRNET=m
CONFIG_IRCOMM=y
# CONFIG_IRDA_ULTRA is not set
diff --git a/opie-taskbar/opie-taskbar_cvs.oe b/opie-taskbar/opie-taskbar_cvs.oe
index eccb32d31c..35e34a57ab 100644
--- a/opie-taskbar/opie-taskbar_cvs.oe
+++ b/opie-taskbar/opie-taskbar_cvs.oe
@@ -6,7 +6,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
DEPENDS = "opie-libqrsync"
PV = "1.1.5-cvs-${CVSDATE}"
APPNAME = "qpe"
-PR = "r12"
+PR = "r13"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/calibrate \
cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/mediummount \
@@ -23,12 +23,20 @@ SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/cal
S = "${WORKDIR}/launcher"
# Caps/Numlock icons for devices with keyboard
-EXTRA_QMAKEVARS_POST_append_collie = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_poodle = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_shepherd = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_corgi = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_husky = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_tosa = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_collie = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_poodle = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_shepherd = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_corgi = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_husky = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_tosa = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+
+# Wallpaper and welcome splash
+PIXMAP_SIZE = ""
+PIXMAP_SIZE_shepherd = "-640x480"
+PIXMAP_SIZE_corgi = "-640x480"
+PIXMAP_SIZE_husky = "-640x480"
+PIXMAP_SIZE_tosa = "-640x480"
+PIXMAP_SIZE_simpad = "-800x600"
inherit opie update-rc.d
@@ -47,6 +55,7 @@ do_stage() {
}
SECTIONS = "1Pim Applications Examples Games Opie-SH Python Settings"
+PICS = "opielogo32x32.png start_button.png new_wait.png opielogo16x16.png sidebar.png"
do_install() {
install -d ${D}/${palmtopdir}/bin
@@ -65,16 +74,24 @@ do_install() {
install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}/${palmtopdir}/bin/
install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}/${palmtopdir}/apps/Settings/
install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}/${palmtopdir}/apps/Settings/
- install -m 0644 ${WORKDIR}/pics/launcher/*.* ${D}/${palmtopdir}/pics/launcher/
+
+ for p in ${PICS}
+ do
+ install -m 0644 ${WORKDIR}/pics/launcher/$p ${D}/${palmtopdir}/pics/launcher/$p
+ done
+ install -m 0644 ${WORKDIR}/pics/launcher/firstuse${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/firstuse.jpg
+ install -m 0644 ${WORKDIR}/pics/launcher/opie-background${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/opie-background.jpg
+
install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}/${palmtopdir}/pics/logo/
+
install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}/${palmtopdir}/etc/colors/
install -m 0644 ${WORKDIR}/etc/mime.types ${D}/etc/
+
install -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie
install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/
-
}
-#this two should be installed only on devices with keyboard
+# These two should be installed only on devices with keyboard
do_install_append_collie () {
install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
diff --git a/patcher/patcher-native.oe b/patcher/patcher-native.oe
deleted file mode 100644
index 91bf4cee2f..0000000000
--- a/patcher/patcher-native.oe
+++ /dev/null
@@ -1,8 +0,0 @@
-include patcher.oe
-inherit native
-DEPENDS = ""
-INHIBIT_DEFAULT_DEPS = "1"
-
-do_stage() {
- install -m 0755 ${DL_DIR}/patcher ${STAGING_BINDIR}/
-}
diff --git a/patcher/patcher-native_20040521.oe b/patcher/patcher-native_20040521.oe
deleted file mode 100644
index 7b96328569..0000000000
--- a/patcher/patcher-native_20040521.oe
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Patcher is a perl script for managing patches."
-LICENSE = "Perl"
-DEPENDS = ""
-SECTION = "base"
-PRIORITY = "optional"
-MAINTAINER = "Holger Schurig <hs4233@mail.mn-solutions.de>"
-INHIBIT_DEFAULT_DEPS = "1"
-PACKAGES = ""
-
-SRC_URI = "http://www.holgerschurig.de/files/linux/patcher-20040521.tar.bz2"
-S="${WORKDIR}/patcher"
-
-do_stage() {
- install -m 0755 patcher ${STAGING_BINDIR}/
-}
diff --git a/patcher/patcher_20040521.oe b/patcher/patcher-native_20040913.oe
index e69de29bb2..e69de29bb2 100644
--- a/patcher/patcher_20040521.oe
+++ b/patcher/patcher-native_20040913.oe
diff --git a/patcher/patcher.oe b/patcher/patcher.oe
deleted file mode 100644
index e17647b1aa..0000000000
--- a/patcher/patcher.oe
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Patcher is a perl script for managing patches."
-LICENSE = "Perl"
-DEPENDS = ""
-SECTION = "base"
-PRIORITY = "optional"
-MAINTAINER = "Holger Schurig <hs4233@mn-solutions.de>"
-INHIBIT_DEFAULT_DEPS = "1"
-
-SRC_URI = "http://www.mn-logistik.de/unsupported/pxa250/patcher"
-
-do_unpack() {
- true
-}
-
-do_install() {
- install -d ${D}${bindir}
- install -m 0755 ${DL_DIR}/patcher ${D}/${bindir}
-}
-
-DEPENDS_prepend_delete = "patcher "
diff --git a/patcher/patcher_20040913.oe b/patcher/patcher_20040913.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/patcher/patcher_20040913.oe
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 14:03:35 +0000