[oe-commits] org.oe.dev opie-taskbar: Split startup and general configuration files into own package, opie-init.
pfalcon commit
openembedded-commits at lists.openembedded.org
Fri Mar 30 15:51:19 UTC 2007
opie-taskbar: Split startup and general configuration files into own package, opie-init.
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 1161b24f978165b889f1fc52b8f6168a4d0ce9dc
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1161b24f978165b889f1fc52b8f6168a4d0ce9dc
Files:
1
packages/opie-taskbar/opie-taskbar/akita
packages/opie-init/opie-init/akita
packages/opie-taskbar/opie-taskbar/c7x0
packages/opie-init/opie-init/c7x0
packages/opie-taskbar/opie-taskbar/htcuniversal
packages/opie-init/opie-init/htcuniversal
packages/opie-taskbar/opie-taskbar/locale.conf
packages/opie-init/opie-init/locale.conf
packages/opie-taskbar/opie-taskbar/mnci
packages/opie-init/opie-init/mnci
packages/opie-taskbar/opie-taskbar/opie
packages/opie-init/opie-init/opie
packages/opie-taskbar/opie-taskbar/opie-reorgfiles
packages/opie-init/opie-init/opie-reorgfiles
packages/opie-taskbar/opie-taskbar/opie_defaults
packages/opie-init/opie-init/opie_defaults
packages/opie-taskbar/opie-taskbar/qpe.conf
packages/opie-init/opie-init/qpe.conf
packages/opie-taskbar/opie-taskbar/simpad
packages/opie-init/opie-init/simpad
packages/opie-taskbar/opie-taskbar/spitz
packages/opie-init/opie-init/spitz
packages/opie-taskbar/opie-taskbar/tosa
packages/opie-init/opie-init/tosa
packages/opie-init
packages/opie-init/opie-init
packages/opie-init/opie-init.inc
packages/opie-init/opie-init_cvs.bb
packages/opie-taskbar/opie-taskbar.inc
packages/opie-taskbar/opie-taskbar_1.2.2.bb
packages/opie-taskbar/opie-taskbar_cvs.bb
Diffs:
#
# mt diff -r31ae6032f4387260877be7f6a21e6b2272aa21af -r1161b24f978165b889f1fc52b8f6168a4d0ce9dc
#
#
#
# rename "packages/opie-taskbar/opie-taskbar/akita"
# to "packages/opie-init/opie-init/akita"
#
# rename "packages/opie-taskbar/opie-taskbar/c7x0"
# to "packages/opie-init/opie-init/c7x0"
#
# rename "packages/opie-taskbar/opie-taskbar/htcuniversal"
# to "packages/opie-init/opie-init/htcuniversal"
#
# rename "packages/opie-taskbar/opie-taskbar/locale.conf"
# to "packages/opie-init/opie-init/locale.conf"
#
# rename "packages/opie-taskbar/opie-taskbar/mnci"
# to "packages/opie-init/opie-init/mnci"
#
# rename "packages/opie-taskbar/opie-taskbar/opie"
# to "packages/opie-init/opie-init/opie"
#
# rename "packages/opie-taskbar/opie-taskbar/opie-reorgfiles"
# to "packages/opie-init/opie-init/opie-reorgfiles"
#
# rename "packages/opie-taskbar/opie-taskbar/opie_defaults"
# to "packages/opie-init/opie-init/opie_defaults"
#
# rename "packages/opie-taskbar/opie-taskbar/qpe.conf"
# to "packages/opie-init/opie-init/qpe.conf"
#
# rename "packages/opie-taskbar/opie-taskbar/simpad"
# to "packages/opie-init/opie-init/simpad"
#
# rename "packages/opie-taskbar/opie-taskbar/spitz"
# to "packages/opie-init/opie-init/spitz"
#
# rename "packages/opie-taskbar/opie-taskbar/tosa"
# to "packages/opie-init/opie-init/tosa"
#
# add_dir "packages/opie-init"
#
# add_dir "packages/opie-init/opie-init"
#
# add_file "packages/opie-init/opie-init.inc"
# content [9bbf8651a7c66d185cc42caf5cc09ceb4c939a5b]
#
# add_file "packages/opie-init/opie-init_cvs.bb"
# content [7015d91853c1a66af285acd773c9d896d063fb98]
#
# patch "packages/opie-taskbar/opie-taskbar.inc"
# from [f21f607fb09e968936f0af3e45ae96549fe8c310]
# to [5e37066e544b2568997efb629a7497162c167149]
#
# patch "packages/opie-taskbar/opie-taskbar_1.2.2.bb"
# from [89f6acc41a76c781c3070c32f96d508b63c0c43e]
# to [11e2b0b1d9323f33812f4f01ea4ac2d3a8068e59]
#
# patch "packages/opie-taskbar/opie-taskbar_cvs.bb"
# from [209aeddba66bfbf3c985c65f3f296c92367d2fdd]
# to [388801781efd96024702f7c551ee025a8329ac22]
#
============================================================
--- packages/opie-init/opie-init.inc 9bbf8651a7c66d185cc42caf5cc09ceb4c939a5b
+++ packages/opie-init/opie-init.inc 9bbf8651a7c66d185cc42caf5cc09ceb4c939a5b
@@ -0,0 +1,43 @@
+DESCRIPTION = "Opie Startup scripts and config"
+SECTION = "opie/base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+#APPNAME = "qpe"
+
+#S = "${WORKDIR}/launcher"
+
+#inherit opie
+inherit update-rc.d
+
+INITSCRIPT_NAME = "opie"
+INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ."
+
+do_install() {
+ install -d ${D}${sysconfdir}/init.d
+ install -d ${D}${sysconfdir}/profile.d
+ install -d ${D}${palmtopdir}/bin
+ install -d ${D}${palmtopdir}/etc/skel
+
+ install -m 0755 ${WORKDIR}/opie ${D}${sysconfdir}/init.d/opie
+ install -m 0644 ${WORKDIR}/opie_defaults ${D}${sysconfdir}/profile.d/
+
+ install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}${palmtopdir}/bin/
+ install -m 0644 ${WORKDIR}/qpe.conf ${D}${palmtopdir}/etc/skel/
+
+ if [ -s ${WORKDIR}/locale.conf ]; then
+ install -m 0644 ${WORKDIR}/locale.conf ${D}${palmtopdir}/etc/skel/
+ fi
+
+ case ${MACHINE} in
+ c7x0)
+ install -d ${D}${sysconfdir}/apm/event.d/
+ install -m 0755 ${WORKDIR}/qpe-suspend-resume ${D}${sysconfdir}/apm/event.d/00-qpe-suspend-resume.sh
+ ;;
+ *)
+ ;;
+ esac
+}
+
+FILES_opie-init_append = " ${sysconfdir} ${palmtopdir}"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
============================================================
--- packages/opie-init/opie-init_cvs.bb 7015d91853c1a66af285acd773c9d896d063fb98
+++ packages/opie-init/opie-init_cvs.bb 7015d91853c1a66af285acd773c9d896d063fb98
@@ -0,0 +1,11 @@
+require ${PN}.inc
+PV = "${OPIE_CVS_PV}"
+PR = "r0"
+
+SRC_URI = "file://opie-reorgfiles \
+ file://opie \
+ file://qpe.conf \
+ file://locale.conf \
+ file://opie_defaults"
+
+SRC_URI_append_c7x0 = " file://qpe-suspend-resume"
============================================================
--- packages/opie-taskbar/opie-taskbar.inc f21f607fb09e968936f0af3e45ae96549fe8c310
+++ packages/opie-taskbar/opie-taskbar.inc 5e37066e544b2568997efb629a7497162c167149
@@ -27,11 +27,8 @@ PIXMAP_SIZE_hx4700 = "-480x640"
PIXMAP_SIZE_htcuniversal= "-480x640"
PIXMAP_SIZE_hx4700 = "-480x640"
-inherit opie update-rc.d
+inherit opie
-INITSCRIPT_NAME = "opie"
-INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ."
-
do_configure_prepend() {
ln -s ${WORKDIR}/calibrate ${S}/calibrate
ln -s ${WORKDIR}/mediummount ${S}/mediummount
@@ -56,16 +53,13 @@ do_install() {
install -d ${D}${palmtopdir}/pics/launcher
install -d ${D}${palmtopdir}/pics/logo
install -d ${D}${palmtopdir}/pics/RoH/star/
- install -d ${D}${sysconfdir}/init.d
- install -d ${D}${sysconfdir}/profile.d
install -d ${D}${palmtopdir}/etc/colors
install -d ${D}${palmtopdir}/etc/skel
+ install -d ${D}${sysconfdir}
install -m 0755 ${S}/qpe ${D}${palmtopdir}/bin/qpe
- 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}/opie_defaults ${D}${sysconfdir}/profile.d/
for p in ${PICS}
do
@@ -80,35 +74,10 @@ do_install() {
install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}${palmtopdir}/etc/colors/
install -m 0644 ${WORKDIR}/etc/mime.types ${D}${sysconfdir}/
- install -m 0755 ${WORKDIR}/opie ${D}${sysconfdir}/init.d/opie
- install -m 0644 ${WORKDIR}/qpe.conf ${D}${palmtopdir}/etc/skel/
-
- if [ -s ${WORKDIR}/locale.conf ]; then
- install -m 0644 ${WORKDIR}/locale.conf ${D}${palmtopdir}/etc/skel/
- fi
-
install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}${palmtopdir}/pics/
install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}${palmtopdir}/pics/
-
- case ${MACHINE} in
- c7x0)
- install -d ${D}${sysconfdir}/apm/event.d/
- install -m 0755 ${WORKDIR}/qpe-suspend-resume ${D}${sysconfdir}/apm/event.d/00-qpe-suspend-resume.sh
- ;;
- *)
- ;;
- esac
}
-updatercd_postinst_mnci() {
-if test "x$D" != "x"; then
- D="-r $D"
-else
- D="" # do not autostart at installation time
-fi
-update-rc.d $D ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
-}
-
FILES_opie-taskbar_append = " ${sysconfdir} ${palmtopdir}/apps ${palmtopdir}/pics"
PACKAGE_ARCH = "${MACHINE_ARCH}"
============================================================
--- packages/opie-taskbar/opie-taskbar_1.2.2.bb 89f6acc41a76c781c3070c32f96d508b63c0c43e
+++ packages/opie-taskbar/opie-taskbar_1.2.2.bb 11e2b0b1d9323f33812f4f01ea4ac2d3a8068e59
@@ -1,5 +1,5 @@ require ${PN}.inc
require ${PN}.inc
-PR = "r6"
+PR = "r7"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
@@ -10,10 +10,4 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};m
${HANDHELDS_CVS};tag=${TAG};module=opie/etc \
file://nomax.patch;patch=1;pnum=3 \
file://server.pro \
+ "
- file://opie-reorgfiles \
- file://opie \
- file://qpe.conf \
- file://locale.conf \
- file://opie_defaults"
-
-SRC_URI_append_c7x0 = " file://qpe-suspend-resume"
============================================================
--- packages/opie-taskbar/opie-taskbar_cvs.bb 209aeddba66bfbf3c985c65f3f296c92367d2fdd
+++ packages/opie-taskbar/opie-taskbar_cvs.bb 388801781efd96024702f7c551ee025a8329ac22
@@ -1,6 +1,6 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r6"
+PR = "r7"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
@@ -11,10 +11,4 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/
${HANDHELDS_CVS};module=opie/etc \
file://nomax.patch;patch=1;pnum=3 \
file://server.pro \
+ "
- file://opie-reorgfiles \
- file://opie \
- file://qpe.conf \
- file://locale.conf \
- file://opie_defaults"
-
-SRC_URI_append_c7x0 = " file://qpe-suspend-resume"
More information about the Openembedded-commits
mailing list