I have made the following changes intended for : CE:MW:Shared / dsme Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/6846 Thank You, Pekka Lundstrom [This message was auto-generated] --- Request # 6846: Messages from BOSS: State: review at 2012-10-01T12:14:02 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:plundstr:branches:CE:MW:Shared / dsme -> CE:MW:Shared / dsme changes files: -------------- --- dsme.changes +++ dsme.changes @@ -0,0 +1,7 @@ +* Mon Oct 01 2012 Pekka Lundstrom <[email protected]> - 0.62.3 +- validatorlistener module loading can be omitted with --disable-validatorlistener + Fixes NEMO#471, JB#2600 - dsme gives warning on start about missing /etc/init.conf + +* Thu Sep 27 2012 Pekka Lundstrom <[email protected]> - 0.62.2.2 +- JB#2624, NEMO#470 - Get rid of dsme-start.sh script + old: ---- dsme-0.62.2.1.tar.gz dsme-start.sh new: ---- dsme-0.62.3.tar.gz spec files: ----------- --- dsme.spec +++ dsme.spec @@ -9,15 +9,14 @@ # << macros Summary: Device State Management Entity -Version: 0.62.2.1 +Version: 0.62.3 Release: 0 Group: System/System Control License: LGPLv2+ URL: https://github.com/nemomobile/dsme Source0: %{name}-%{version}.tar.gz Source1: dsme.service -Source2: dsme-start.sh -Source3: dsme-rpmlintrc +Source2: dsme-rpmlintrc Source100: dsme.yaml Requires: systemd Requires(preun): systemd @@ -55,7 +54,8 @@ --disable-poweron-timer \ --disable-upstart \ --enable-runlevel \ - --enable-pwrkeymonitor + --enable-pwrkeymonitor \ + --disable-validatorlistener make %{?jobs:-j%jobs} @@ -72,7 +72,6 @@ install -D -m 644 %{SOURCE1} %{buildroot}/lib/systemd/system/%{name}.service install -d %{buildroot}/lib/systemd/system/multi-user.target.wants/ ln -s ../%{name}.service %{buildroot}/lib/systemd/system/multi-user.target.wants/%{name}.service -install -D -m 0755 %{SOURCE2} %{buildroot}/usr/sbin/dsme-start.sh # << install post other changes: -------------- ++++++ dsme-0.62.2.1.tar.gz -> dsme-0.62.3.tar.gz --- configure.ac +++ configure.ac @@ -1,5 +1,5 @@ # Package name and version -AC_INIT(dsme, 0.62.2) +AC_INIT(dsme, 0.62.3) AM_INIT_AUTOMAKE @@ -66,6 +66,19 @@ AM_CONDITIONAL([WANT_UPSTART], [test x$enable_upstart != xno]) # +# validatorlistener +# +AC_ARG_ENABLE([validatorlistener], + [AS_HELP_STRING([--disable-validatorlistener], + [disable validatorlistener plugin (validatorlistener)])], + [], + [enable_validatorlistener=yes]) + +AS_IF([test "x$enable_validatorlistener" != xno], + [AC_DEFINE([DSME_VALIDATOR_LISTENER], [1])]) +AM_CONDITIONAL([WANT_VALIDATOR_LISTENER], [test x$enable_validatorlistener != xno]) + +# # memory thermal mgmt # AC_ARG_ENABLE([memory-thermal-mgmt], --- modules/Makefile.am +++ modules/Makefile.am @@ -18,7 +18,6 @@ iphb.la \ thermalflagger.la \ malf.la \ - validatorlistener.la \ diskmonitor.la \ tempreaper.la \ dbusautoconnector.la @@ -56,6 +55,10 @@ pkglib_LTLIBRARIES += upstart.la endif +if WANT_VALIDATOR_LISTENER +pkglib_LTLIBRARIES += validatorlistener.la +endif + if WANT_PWRKEY_MONITOR pkglib_LTLIBRARIES += pwrkeymonitor.la endif @@ -84,6 +87,11 @@ upstart_la_LIBADD = $(DBUS_LIBS) endif +if WANT_VALIDATOR_LISTENER +runlevel_la_SOURCES = validatorlistener.c +validatorlistener_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) +endif + processwd_la_SOURCES = processwd.c processwd_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) @@ -111,8 +119,6 @@ malf_la_SOURCES = malf.c -validatorlistener_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) - if WANT_BMEIPC thermalobject_surface_la_SOURCES = thermalobject_surface.c \ thermalsensor_battery.c \ --- modules/startup.c +++ modules/startup.c @@ -95,7 +95,9 @@ #ifdef DSME_POWERON_TIMER "powerontimer.so", #endif - "validatorlistener.so", // TODO: hardcode this in dsme core +#ifdef DSME_VALIDATOR_LISTENER + "validatorlistener.so", +#endif "diskmonitor.so", "tempreaper.so", "dbusautoconnector.so", ++++++ dsme.service --- dsme.service +++ dsme.service @@ -4,7 +4,8 @@ [Service] Environment=DSME_SOCKFILE=/run/dsme.socket -ExecStart=/usr/sbin/dsme-start.sh +Environment=BOOTSTATE=USER +ExecStart=/usr/sbin/dsme -p /usr/lib/dsme/libstartup.so Restart=always [Install] ++++++ dsme.yaml --- dsme.yaml +++ dsme.yaml @@ -1,6 +1,6 @@ Name: dsme Summary: Device State Management Entity -Version: 0.62.2.1 +Version: 0.62.3 Release: 0 Group: System/System Control License: LGPLv2+ @@ -15,11 +15,11 @@ - "--disable-upstart" - "--enable-runlevel" - "--enable-pwrkeymonitor" + - "--disable-validatorlistener" Sources: - "%{name}-%{version}.tar.gz" - "dsme.service" - - "dsme-start.sh" - "dsme-rpmlintrc" Patches: ++++++ deleted files: --- dsme-start.sh
