Re: [OE-core] [PATCH V3] base-files: provide a mechanism to skip creation of the hostname file

[Koen Kooi]

Op 7 sep. 2012, om 23:51 heeft Mark Hatle mark.ha...@windriver.com het 
volgende geschreven:

 From: Mark Asselstine mark.asselst...@windriver.com
 
 The existence of a /etc/hostname file causes any hostname provided on
 the kernel command line or via dhcp to be overwritten by the
 initscripts 'init.d/hostname.sh'. This change allows you to set a
 value of  for 'hostname' which will skip the creation of the
 /etc/hostname file by the base-files package.
 
 Signed-off-by: Mark Asselstine mark.asselst...@windriver.com
 Signed-off-by: Jason Wessel jason.wes...@windriver.com
 Signed-off-by: Mark Hatle mark.ha...@windriver.com
 ---
 meta/recipes-core/base-files/base-files_3.0.14.bb |   12 +++-
 1 files changed, 7 insertions(+), 5 deletions(-)
 
 diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb 
 b/meta/recipes-core/base-files/base-files_3.0.14.bb
 index 6bab040..cda13f4 100644
 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb
 +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
 @@ -107,10 +107,12 @@ do_install () {
 }
 
 do_install_basefilesissue () {
 - if [ -n ${MACHINE} -a ${hostname} = openembedded ]; then
 - echo ${MACHINE}  ${D}${sysconfdir}/hostname
 - else
 - echo ${hostname}  ${D}${sysconfdir}/hostname
 + if [ ${hostname} !=  ]; then
 + if [ -n ${MACHINE} -a ${hostname} = openembedded ]; then
 + echo ${MACHINE}  ${D}${sysconfdir}/hostname
 + else
 + echo ${hostname}  ${D}${sysconfdir}/hostname
 + fi
   fi
 
   install -m 644 ${WORKDIR}/issue*  ${D}${sysconfdir}  
 @@ -144,5 +146,5 @@ FILES_${PN}-doc = ${docdir} ${datadir}/common-licenses
 
 PACKAGE_ARCH = ${MACHINE_ARCH}
 
 -CONFFILES_${PN} = ${sysconfdir}/fstab ${sysconfdir}/hostname
 +CONFFILES_${PN} = ${sysconfdir}/fstab ${@['', 
 '${sysconfdir}/hostname'][(d.getVar('hostname', True) != '')]}

MIssing PR bump
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH V3] base-files: provide a mechanism to skip creation of the hostname file

[Mark Hatle]

From: Mark Asselstine mark.asselst...@windriver.com

The existence of a /etc/hostname file causes any hostname provided on
the kernel command line or via dhcp to be overwritten by the
initscripts 'init.d/hostname.sh'. This change allows you to set a
value of  for 'hostname' which will skip the creation of the
/etc/hostname file by the base-files package.

Signed-off-by: Mark Asselstine mark.asselst...@windriver.com
Signed-off-by: Jason Wessel jason.wes...@windriver.com
Signed-off-by: Mark Hatle mark.ha...@windriver.com
---
 meta/recipes-core/base-files/base-files_3.0.14.bb |   12 +++-
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb 
b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 6bab040..cda13f4 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -107,10 +107,12 @@ do_install () {
 }
 
 do_install_basefilesissue () {
-   if [ -n ${MACHINE} -a ${hostname} = openembedded ]; then
-   echo ${MACHINE}  ${D}${sysconfdir}/hostname
-   else
-   echo ${hostname}  ${D}${sysconfdir}/hostname
+   if [ ${hostname} !=  ]; then
+   if [ -n ${MACHINE} -a ${hostname} = openembedded ]; then
+   echo ${MACHINE}  ${D}${sysconfdir}/hostname
+   else
+   echo ${hostname}  ${D}${sysconfdir}/hostname
+   fi
fi
 
install -m 644 ${WORKDIR}/issue*  ${D}${sysconfdir}  
@@ -144,5 +146,5 @@ FILES_${PN}-doc = ${docdir} ${datadir}/common-licenses
 
 PACKAGE_ARCH = ${MACHINE_ARCH}
 
-CONFFILES_${PN} = ${sysconfdir}/fstab ${sysconfdir}/hostname
+CONFFILES_${PN} = ${sysconfdir}/fstab ${@['', 
'${sysconfdir}/hostname'][(d.getVar('hostname', True) != '')]}
 
-- 
1.7.3.4


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH V3] base-files: provide a mechanism to skip creation of the hostname file

[Richard Purdie]

On Fri, 2012-09-07 at 16:51 -0500, Mark Hatle wrote:
 From: Mark Asselstine mark.asselst...@windriver.com
 
 The existence of a /etc/hostname file causes any hostname provided on
 the kernel command line or via dhcp to be overwritten by the
 initscripts 'init.d/hostname.sh'. This change allows you to set a
 value of  for 'hostname' which will skip the creation of the
 /etc/hostname file by the base-files package.
 
 Signed-off-by: Mark Asselstine mark.asselst...@windriver.com
 Signed-off-by: Jason Wessel jason.wes...@windriver.com
 Signed-off-by: Mark Hatle mark.ha...@windriver.com
 ---
  meta/recipes-core/base-files/base-files_3.0.14.bb |   12 +++-
  1 files changed, 7 insertions(+), 5 deletions(-)
 
 diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb 
 b/meta/recipes-core/base-files/base-files_3.0.14.bb
 index 6bab040..cda13f4 100644
 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb
 +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
 @@ -107,10 +107,12 @@ do_install () {
  }
  
  do_install_basefilesissue () {
 - if [ -n ${MACHINE} -a ${hostname} = openembedded ]; then
 - echo ${MACHINE}  ${D}${sysconfdir}/hostname
 - else
 - echo ${hostname}  ${D}${sysconfdir}/hostname
 + if [ ${hostname} !=  ]; then
 + if [ -n ${MACHINE} -a ${hostname} = openembedded ]; then
 + echo ${MACHINE}  ${D}${sysconfdir}/hostname
 + else
 + echo ${hostname}  ${D}${sysconfdir}/hostname
 + fi
   fi


Is this missing a hostname ??= openembedded perhaps?

Cheers,

Richard

   install -m 644 ${WORKDIR}/issue*  ${D}${sysconfdir}  
 @@ -144,5 +146,5 @@ FILES_${PN}-doc = ${docdir} ${datadir}/common-licenses
  
  PACKAGE_ARCH = ${MACHINE_ARCH}
  
 -CONFFILES_${PN} = ${sysconfdir}/fstab ${sysconfdir}/hostname
 +CONFFILES_${PN} = ${sysconfdir}/fstab ${@['', 
 '${sysconfdir}/hostname'][(d.getVar('hostname', True) != '')]}
  



___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core