Patchwork [meta-oe,2/3] atftp: correctly handle init script

login
register
mail settings
Submitter Eric BENARD
Date Dec. 2, 2011, 11:20 a.m.
Message ID <1322824856-15965-2-git-send-email-eric@eukrea.com>
Download mbox | patch
Permalink /patch/16093/
State Accepted
Commit f50fc8c1962c39c97018629e59b56b65caf20ace
Headers show

Comments

Eric BENARD - Dec. 2, 2011, 11:20 a.m.
else it's affected to atftp package which is the client
and not the server, but the init file is only in the server
package thus leading to the following log at boot :
Configuring atftp.
update-rc.d: /etc/init.d/atftpd: file does not exist

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 meta-oe/recipes-extended/atftp/atftp_0.7.bb |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
Koen Kooi - Dec. 2, 2011, 11:48 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 02-12-11 12:20, Eric Bénard schreef:
> else it's affected to atftp package which is the client and not the
> server, but the init file is only in the server package thus leading to
> the following log at boot : Configuring atftp. update-rc.d:
> /etc/init.d/atftpd: file does not exist
> 
> Signed-off-by: Eric Bénard <eric@eukrea.com> --- 
> meta-oe/recipes-extended/atftp/atftp_0.7.bb |   10 ++++++---- 1 files
> changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/meta-oe/recipes-extended/atftp/atftp_0.7.bb
> b/meta-oe/recipes-extended/atftp/atftp_0.7.bb index c541634..ab14a28
> 100644 --- a/meta-oe/recipes-extended/atftp/atftp_0.7.bb +++
> b/meta-oe/recipes-extended/atftp/atftp_0.7.bb @@ -3,6 +3,7 @@ SECTION =
> "network" HOMEPAGE = "http://packages.debian.org/atftp" LICENSE =
> "GPLv2" LIC_FILES_CHKSUM =
> "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" +PR = "r1"
> 
> SRC_URI =
> "${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.dfsg.orig.tar.gz;name=archive
> \ ${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.dfsg-11.diff.gz;name=patch \ 
> @@ -16,11 +17,12 @@ inherit autotools update-rc.d systemd useradd 
> SYSTEMD_PACKAGES = "atftpd-systemd" SYSTEMD_SERVICE_atftpd-systemd =
> "atftpd.service"
> 
> -INITSCRIPT_NAME = "atftpd" -INITSCRIPT_PARAMS = "defaults 80" 
> +INITSCRIPT_PACKAGES = "${PN}d" +INITSCRIPT_NAME_${PN}d = "atftpd" 
> +INITSCRIPT_PARAMS_${PN}d = "defaults 80"
> 
> -USERADD_PACKAGES = "atftpd" -USERADD_PARAM_atftpd = "--system
> --no-create-home --shell /bin/false \ +USERADD_PACKAGES = "${PN}d" 
> +USERADD_PARAM_${PN}d = "--system --no-create-home --shell /bin/false \ 
> --user-group nobody"

Was the USERADD change intentional?


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk7YuwQACgkQMkyGM64RGpF28ACgp424Q0NwZ8bd7YPA9Sb8N72f
Ug4AoKSN21FrC2eX55kKso8MEWt9lTwY
=4fY6
-----END PGP SIGNATURE-----
Eric BENARD - Dec. 2, 2011, 2:37 p.m.
Hi,

>> -INITSCRIPT_NAME = "atftpd" -INITSCRIPT_PARAMS = "defaults 80"
>> +INITSCRIPT_PACKAGES = "${PN}d" +INITSCRIPT_NAME_${PN}d = "atftpd"
>> +INITSCRIPT_PARAMS_${PN}d = "defaults 80"
>>
>> -USERADD_PACKAGES = "atftpd" -USERADD_PARAM_atftpd = "--system
>> --no-create-home --shell /bin/false \ +USERADD_PACKAGES = "${PN}d"
>> +USERADD_PARAM_${PN}d = "--system --no-create-home --shell /bin/false \
>> --user-group nobody"
>
> Was the USERADD change intentional?
>
yes, in fact there is no functional change, only a cosmetic one,
the only goal is to have the atftpd parchaque consistent (${PN}d instead of 
atftpd)

Eric

Patch

diff --git a/meta-oe/recipes-extended/atftp/atftp_0.7.bb b/meta-oe/recipes-extended/atftp/atftp_0.7.bb
index c541634..ab14a28 100644
--- a/meta-oe/recipes-extended/atftp/atftp_0.7.bb
+++ b/meta-oe/recipes-extended/atftp/atftp_0.7.bb
@@ -3,6 +3,7 @@  SECTION = "network"
 HOMEPAGE = "http://packages.debian.org/atftp"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
+PR = "r1"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.dfsg.orig.tar.gz;name=archive \
            ${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.dfsg-11.diff.gz;name=patch \
@@ -16,11 +17,12 @@  inherit autotools update-rc.d systemd useradd
 SYSTEMD_PACKAGES = "atftpd-systemd"
 SYSTEMD_SERVICE_atftpd-systemd = "atftpd.service"
 
-INITSCRIPT_NAME = "atftpd"
-INITSCRIPT_PARAMS = "defaults 80"
+INITSCRIPT_PACKAGES = "${PN}d"
+INITSCRIPT_NAME_${PN}d = "atftpd"
+INITSCRIPT_PARAMS_${PN}d = "defaults 80"
 
-USERADD_PACKAGES = "atftpd"
-USERADD_PARAM_atftpd = "--system --no-create-home --shell /bin/false \
+USERADD_PACKAGES = "${PN}d"
+USERADD_PARAM_${PN}d = "--system --no-create-home --shell /bin/false \
                         --user-group nobody"
 
 do_install_append() {