From a31229ef8c96e6ad6dbe5c7b9c78639354b73ec0 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 30 Mar 2007 15:39:06 +0000 Subject: [PATCH] opie-taskbar: Split startup and general configuration files into own package, opie-init. --- .../akita => opie-init}/.mtn2git_empty | 0 packages/opie-init/opie-init.inc | 43 +++++++++++++++++++ .../opie-init}/.mtn2git_empty | 0 .../opie-init/akita}/.mtn2git_empty | 0 .../opie-init}/akita/qpe.conf | 0 .../opie-init/c7x0}/.mtn2git_empty | 0 .../opie-init}/c7x0/opie | 0 .../opie-init}/c7x0/qpe-suspend-resume | 0 .../opie-init}/c7x0/qpe.conf | 0 .../opie-init/htcuniversal}/.mtn2git_empty | 0 .../opie-init}/htcuniversal/qpe.conf | 0 .../opie-init}/locale.conf | 0 .../opie-init/mnci}/.mtn2git_empty | 0 .../opie-init}/mnci/opie | 0 .../opie-init}/mnci/qpe.conf | 0 .../opie-taskbar => opie-init/opie-init}/opie | 0 .../opie-init}/opie-reorgfiles | 0 .../opie-init}/opie_defaults | 0 .../opie-init}/qpe.conf | 0 .../opie-init/simpad}/.mtn2git_empty | 0 .../opie-init}/simpad/qpe.conf | 0 .../opie-init/opie-init/spitz/.mtn2git_empty | 0 .../opie-init}/spitz/qpe.conf | 0 .../opie-init/opie-init/tosa/.mtn2git_empty | 0 .../opie-init}/tosa/qpe.conf | 0 packages/opie-init/opie-init_cvs.bb | 11 +++++ packages/opie-taskbar/opie-taskbar.inc | 35 +-------------- packages/opie-taskbar/opie-taskbar_1.2.2.bb | 10 +---- packages/opie-taskbar/opie-taskbar_cvs.bb | 10 +---- 29 files changed, 60 insertions(+), 49 deletions(-) rename packages/{opie-taskbar/opie-taskbar/akita => opie-init}/.mtn2git_empty (100%) create mode 100644 packages/opie-init/opie-init.inc rename packages/{opie-taskbar/opie-taskbar/c7x0 => opie-init/opie-init}/.mtn2git_empty (100%) rename packages/{opie-taskbar/opie-taskbar/htcuniversal => opie-init/opie-init/akita}/.mtn2git_empty (100%) rename packages/{opie-taskbar/opie-taskbar => opie-init/opie-init}/akita/qpe.conf (100%) rename packages/{opie-taskbar/opie-taskbar/mnci => opie-init/opie-init/c7x0}/.mtn2git_empty (100%) rename packages/{opie-taskbar/opie-taskbar => opie-init/opie-init}/c7x0/opie (100%) rename packages/{opie-taskbar/opie-taskbar => opie-init/opie-init}/c7x0/qpe-suspend-resume (100%) rename packages/{opie-taskbar/opie-taskbar => opie-init/opie-init}/c7x0/qpe.conf (100%) rename packages/{opie-taskbar/opie-taskbar/simpad => opie-init/opie-init/htcuniversal}/.mtn2git_empty (100%) rename packages/{opie-taskbar/opie-taskbar => opie-init/opie-init}/htcuniversal/qpe.conf (100%) rename packages/{opie-taskbar/opie-taskbar => opie-init/opie-init}/locale.conf (100%) rename packages/{opie-taskbar/opie-taskbar/spitz => opie-init/opie-init/mnci}/.mtn2git_empty (100%) rename packages/{opie-taskbar/opie-taskbar => opie-init/opie-init}/mnci/opie (100%) rename packages/{opie-taskbar/opie-taskbar => opie-init/opie-init}/mnci/qpe.conf (100%) rename packages/{opie-taskbar/opie-taskbar => opie-init/opie-init}/opie (100%) rename packages/{opie-taskbar/opie-taskbar => opie-init/opie-init}/opie-reorgfiles (100%) rename packages/{opie-taskbar/opie-taskbar => opie-init/opie-init}/opie_defaults (100%) rename packages/{opie-taskbar/opie-taskbar => opie-init/opie-init}/qpe.conf (100%) rename packages/{opie-taskbar/opie-taskbar/tosa => opie-init/opie-init/simpad}/.mtn2git_empty (100%) rename packages/{opie-taskbar/opie-taskbar => opie-init/opie-init}/simpad/qpe.conf (100%) create mode 100644 packages/opie-init/opie-init/spitz/.mtn2git_empty rename packages/{opie-taskbar/opie-taskbar => opie-init/opie-init}/spitz/qpe.conf (100%) create mode 100644 packages/opie-init/opie-init/tosa/.mtn2git_empty rename packages/{opie-taskbar/opie-taskbar => opie-init/opie-init}/tosa/qpe.conf (100%) create mode 100644 packages/opie-init/opie-init_cvs.bb diff --git a/packages/opie-taskbar/opie-taskbar/akita/.mtn2git_empty b/packages/opie-init/.mtn2git_empty similarity index 100% rename from packages/opie-taskbar/opie-taskbar/akita/.mtn2git_empty rename to packages/opie-init/.mtn2git_empty diff --git a/packages/opie-init/opie-init.inc b/packages/opie-init/opie-init.inc new file mode 100644 index 0000000000..d8003925f6 --- /dev/null +++ b/packages/opie-init/opie-init.inc @@ -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}" diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/.mtn2git_empty b/packages/opie-init/opie-init/.mtn2git_empty similarity index 100% rename from packages/opie-taskbar/opie-taskbar/c7x0/.mtn2git_empty rename to packages/opie-init/opie-init/.mtn2git_empty diff --git a/packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty b/packages/opie-init/opie-init/akita/.mtn2git_empty similarity index 100% rename from packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty rename to packages/opie-init/opie-init/akita/.mtn2git_empty diff --git a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf b/packages/opie-init/opie-init/akita/qpe.conf similarity index 100% rename from packages/opie-taskbar/opie-taskbar/akita/qpe.conf rename to packages/opie-init/opie-init/akita/qpe.conf diff --git a/packages/opie-taskbar/opie-taskbar/mnci/.mtn2git_empty b/packages/opie-init/opie-init/c7x0/.mtn2git_empty similarity index 100% rename from packages/opie-taskbar/opie-taskbar/mnci/.mtn2git_empty rename to packages/opie-init/opie-init/c7x0/.mtn2git_empty diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/opie b/packages/opie-init/opie-init/c7x0/opie similarity index 100% rename from packages/opie-taskbar/opie-taskbar/c7x0/opie rename to packages/opie-init/opie-init/c7x0/opie diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/qpe-suspend-resume b/packages/opie-init/opie-init/c7x0/qpe-suspend-resume similarity index 100% rename from packages/opie-taskbar/opie-taskbar/c7x0/qpe-suspend-resume rename to packages/opie-init/opie-init/c7x0/qpe-suspend-resume diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf b/packages/opie-init/opie-init/c7x0/qpe.conf similarity index 100% rename from packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf rename to packages/opie-init/opie-init/c7x0/qpe.conf diff --git a/packages/opie-taskbar/opie-taskbar/simpad/.mtn2git_empty b/packages/opie-init/opie-init/htcuniversal/.mtn2git_empty similarity index 100% rename from packages/opie-taskbar/opie-taskbar/simpad/.mtn2git_empty rename to packages/opie-init/opie-init/htcuniversal/.mtn2git_empty diff --git a/packages/opie-taskbar/opie-taskbar/htcuniversal/qpe.conf b/packages/opie-init/opie-init/htcuniversal/qpe.conf similarity index 100% rename from packages/opie-taskbar/opie-taskbar/htcuniversal/qpe.conf rename to packages/opie-init/opie-init/htcuniversal/qpe.conf diff --git a/packages/opie-taskbar/opie-taskbar/locale.conf b/packages/opie-init/opie-init/locale.conf similarity index 100% rename from packages/opie-taskbar/opie-taskbar/locale.conf rename to packages/opie-init/opie-init/locale.conf diff --git a/packages/opie-taskbar/opie-taskbar/spitz/.mtn2git_empty b/packages/opie-init/opie-init/mnci/.mtn2git_empty similarity index 100% rename from packages/opie-taskbar/opie-taskbar/spitz/.mtn2git_empty rename to packages/opie-init/opie-init/mnci/.mtn2git_empty diff --git a/packages/opie-taskbar/opie-taskbar/mnci/opie b/packages/opie-init/opie-init/mnci/opie similarity index 100% rename from packages/opie-taskbar/opie-taskbar/mnci/opie rename to packages/opie-init/opie-init/mnci/opie diff --git a/packages/opie-taskbar/opie-taskbar/mnci/qpe.conf b/packages/opie-init/opie-init/mnci/qpe.conf similarity index 100% rename from packages/opie-taskbar/opie-taskbar/mnci/qpe.conf rename to packages/opie-init/opie-init/mnci/qpe.conf diff --git a/packages/opie-taskbar/opie-taskbar/opie b/packages/opie-init/opie-init/opie similarity index 100% rename from packages/opie-taskbar/opie-taskbar/opie rename to packages/opie-init/opie-init/opie diff --git a/packages/opie-taskbar/opie-taskbar/opie-reorgfiles b/packages/opie-init/opie-init/opie-reorgfiles similarity index 100% rename from packages/opie-taskbar/opie-taskbar/opie-reorgfiles rename to packages/opie-init/opie-init/opie-reorgfiles diff --git a/packages/opie-taskbar/opie-taskbar/opie_defaults b/packages/opie-init/opie-init/opie_defaults similarity index 100% rename from packages/opie-taskbar/opie-taskbar/opie_defaults rename to packages/opie-init/opie-init/opie_defaults diff --git a/packages/opie-taskbar/opie-taskbar/qpe.conf b/packages/opie-init/opie-init/qpe.conf similarity index 100% rename from packages/opie-taskbar/opie-taskbar/qpe.conf rename to packages/opie-init/opie-init/qpe.conf diff --git a/packages/opie-taskbar/opie-taskbar/tosa/.mtn2git_empty b/packages/opie-init/opie-init/simpad/.mtn2git_empty similarity index 100% rename from packages/opie-taskbar/opie-taskbar/tosa/.mtn2git_empty rename to packages/opie-init/opie-init/simpad/.mtn2git_empty diff --git a/packages/opie-taskbar/opie-taskbar/simpad/qpe.conf b/packages/opie-init/opie-init/simpad/qpe.conf similarity index 100% rename from packages/opie-taskbar/opie-taskbar/simpad/qpe.conf rename to packages/opie-init/opie-init/simpad/qpe.conf diff --git a/packages/opie-init/opie-init/spitz/.mtn2git_empty b/packages/opie-init/opie-init/spitz/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf b/packages/opie-init/opie-init/spitz/qpe.conf similarity index 100% rename from packages/opie-taskbar/opie-taskbar/spitz/qpe.conf rename to packages/opie-init/opie-init/spitz/qpe.conf diff --git a/packages/opie-init/opie-init/tosa/.mtn2git_empty b/packages/opie-init/opie-init/tosa/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf b/packages/opie-init/opie-init/tosa/qpe.conf similarity index 100% rename from packages/opie-taskbar/opie-taskbar/tosa/qpe.conf rename to packages/opie-init/opie-init/tosa/qpe.conf diff --git a/packages/opie-init/opie-init_cvs.bb b/packages/opie-init/opie-init_cvs.bb new file mode 100644 index 0000000000..b45baeb5ae --- /dev/null +++ b/packages/opie-init/opie-init_cvs.bb @@ -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" diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc index 4c357f54b6..8dae3b2484 100644 --- a/packages/opie-taskbar/opie-taskbar.inc +++ b/packages/opie-taskbar/opie-taskbar.inc @@ -27,10 +27,7 @@ PIXMAP_SIZE_asus730 = "-480x640" PIXMAP_SIZE_htcuniversal= "-480x640" PIXMAP_SIZE_hx4700 = "-480x640" -inherit opie update-rc.d - -INITSCRIPT_NAME = "opie" -INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ." +inherit opie do_configure_prepend() { ln -s ${WORKDIR}/calibrate ${S}/calibrate @@ -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,33 +74,8 @@ 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" diff --git a/packages/opie-taskbar/opie-taskbar_1.2.2.bb b/packages/opie-taskbar/opie-taskbar_1.2.2.bb index c6151d2327..497bff0953 100644 --- a/packages/opie-taskbar/opie-taskbar_1.2.2.bb +++ b/packages/opie-taskbar/opie-taskbar_1.2.2.bb @@ -1,5 +1,5 @@ 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};module=opie/core/apps/calibrate \ ${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" + " diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 41119484c1..6ff5a5ef66 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ 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/core/apps/calibrate \ ${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" + " -- 2.39.5