diff options
| author | Muhammad Shakeel <muhammad_shakeel@mentor.com> | 2013-09-27 18:14:15 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-30 22:02:09 +0100 |
| commit | fdcfcea5b8eae1769a217f8efea9c02f037f63fa (patch) | |
| tree | f3139e36fb3ed7c68b0384e00d767b6d5a566b65 | |
| parent | d856488179d14d05f1121c171abf4eac82e81fb9 (diff) | |
| download | openembedded-core-fdcfcea5b8eae1769a217f8efea9c02f037f63fa.tar.gz openembedded-core-fdcfcea5b8eae1769a217f8efea9c02f037f63fa.tar.bz2 openembedded-core-fdcfcea5b8eae1769a217f8efea9c02f037f63fa.zip | |
opkg: Use systemd service for first boot configuration
Currently opkg uses a script to configure packages during first time boot.
This script is present in rcS.d and when 'sysvinit' is disabled this
script doesn't execute. For systemd only distros this newly added service
will run the opkg configure during first boot only.
Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg.inc | 21 | ||||
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg/opkg-configure.service | 17 | ||||
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg_svn.bb | 1 |
3 files changed, 37 insertions, 2 deletions
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc index afe6cb0ce6..3d568867d4 100644 --- a/meta/recipes-devtools/opkg/opkg.inc +++ b/meta/recipes-devtools/opkg/opkg.inc @@ -16,7 +16,13 @@ do_configure_prepend() { sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am } -inherit autotools pkgconfig +inherit autotools pkgconfig systemd + +python () { + if 'sysvinit' not in d.getVar("DISTRO_FEATURES", True).split(): + pn = d.getVar('PN', True) + d.setVar('SYSTEMD_SERVICE_%s' % (pn), 'opkg-configure.service') +} target_localstatedir := "${localstatedir}" OPKGLIBDIR = "${target_localstatedir}/lib" @@ -49,6 +55,16 @@ FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" do_install_append() { # We need to create the lock directory install -d ${D}${OPKGLIBDIR}/opkg + + if ${@base_contains('DISTRO_FEATURES','sysvinit','false','true',d)};then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/opkg-configure.service ${D}${systemd_unitdir}/system/ + sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + -e 's,@BINDIR@,${bindir},g' \ + -e 's,@SYSTEMD_UNITDIR@,${systemd_unitdir},g' \ + ${D}${systemd_unitdir}/system/opkg-configure.service + fi } do_install_append_class-native() { @@ -59,7 +75,8 @@ do_install_append_class-native() { pkg_postinst_${PN} () { #!/bin/sh -if [ "x$D" != "x" ] && [ -f $D${OPKGLIBDIR}/opkg/status ]; then +if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)} && \ + [ "x$D" != "x" ] && [ -f $D${OPKGLIBDIR}/opkg/status ]; then install -d $D${sysconfdir}/rcS.d # this happens at S98 where our good 'ole packages script used to run diff --git a/meta/recipes-devtools/opkg/opkg/opkg-configure.service b/meta/recipes-devtools/opkg/opkg/opkg-configure.service new file mode 100644 index 0000000000..a1c3a31796 --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg/opkg-configure.service @@ -0,0 +1,17 @@ +[Unit] +Description=Opkg first boot configure +DefaultDependencies=no +After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount +Before=sysinit.target + +[Service] +Type=oneshot +EnvironmentFile=-@SYSCONFDIR@/default/postinst +ExecStart=@BASE_BINDIR@/sh -c " if [ $POSTINST_LOGGING = '1' ]; then @BINDIR@/opkg-cl configure > $LOGFILE 2>&1; else @BINDIR@/opkg-cl configure; fi" +ExecStartPost=@BASE_BINDIR@/systemctl disable opkg-configure.service +StandardOutput=syslog +RemainAfterExit=No + +[Install] +WantedBy=basic.target +WantedBy=sysinit.target diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb index bc10491030..cd0485fe38 100644 --- a/meta/recipes-devtools/opkg/opkg_svn.bb +++ b/meta/recipes-devtools/opkg/opkg_svn.bb @@ -3,6 +3,7 @@ require opkg.inc SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http \ file://no-install-recommends.patch \ file://add-exclude.patch \ + file://opkg-configure.service \ " S = "${WORKDIR}/trunk" |