[PATCH 0/3] Pull request with misc fixes from O.S. Systems tree

[PATCH 0/3] Pull request with misc fixes from O.S. Systems tree

[Otavio Salvador]

The following changes since commit 54ecf8e3992b8a01c2e5bd16720e1819b71b68bd:

  packagedata: don't choke on empty PACKAGES (2011-05-20 17:41:34 +0100)

are available in the git repository at:
  git://github.com/OSSystems/oe-core.git master
  https://github.com/OSSystems/oe-core/tree/master

Otavio Salvador (3):
  send-pull-request: drop sendemail checks
  busybox: enable mdev by default
  syslinux: rdepends on mtools

 meta/recipes-core/busybox/busybox-1.18.4/defconfig |    2 +-
 meta/recipes-core/busybox/busybox.inc              |    1 -
 meta/recipes-core/busybox/busybox_1.18.4.bb        |    2 +-
 meta/recipes-devtools/syslinux/syslinux_4.03.bb    |    4 +++-
 scripts/send-pull-request                          |   16 ----------------
 5 files changed, 5 insertions(+), 20 deletions(-)

-- 
1.7.2.5

[PATCH 1/3] send-pull-request: drop sendemail checks

[Otavio Salvador]

git send-email has the correct check on it. Basically the From is
taken from the git 'user' and 'email' config values and in case
'sendemail.smtpserver' is not provided it defaults to use local
sendmail command.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Darren Hart <dvhart@linux.intel.com>
---
 scripts/send-pull-request |   16 ----------------
 1 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/scripts/send-pull-request b/scripts/send-pull-request
index cee9253..5dfc246 100755
--- a/scripts/send-pull-request
+++ b/scripts/send-pull-request
@@ -67,19 +67,6 @@ harvest_recipients()
 	unset IFS
 }
 
-check_git_sendemail_config()
-{
-	GIT_SMTP=$(git config sendemail.smtpserver)
-	GIT_FROM=$(git config sendemail.from)
-	if [ -z "$GIT_SMTP" ] || [ -z "$GIT_FROM" ]; then
-		echo "ERROR: git sendemail is not configured."
-		echo "Please read GIT-SEND-EMAIL(1) and configure:"
-		echo "  sendemail.smtpserver"
-		echo "  sendemail.from"
-		exit 1
-	fi
-}
-
 # Parse and verify arguments
 while getopts "achp:t:" OPT; do
 	case $OPT in
@@ -113,9 +100,6 @@ while getopts "achp:t:" OPT; do
 	esac
 done
 
-# Abort early if git-send-email is not properly configured
-check_git_sendemail_config
-
 if [ -z "$PDIR" ]; then
 	echo "ERROR: you must specify a pull-dir."
 	usage
-- 
1.7.2.5

[PATCH 2/3] busybox: enable mdev by default

[Otavio Salvador]

Since we do not require a configuration file by default we don't force
it's addition on the package. If the a layer wants to have it enabled
it should also set the CONFFILES for busybox-mdev package.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-core/busybox/busybox-1.18.4/defconfig |    2 +-
 meta/recipes-core/busybox/busybox.inc              |    1 -
 meta/recipes-core/busybox/busybox_1.18.4.bb        |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox-1.18.4/defconfig b/meta/recipes-core/busybox/busybox-1.18.4/defconfig
index 5327a64..6b48cc1 100644
--- a/meta/recipes-core/busybox/busybox-1.18.4/defconfig
+++ b/meta/recipes-core/busybox/busybox-1.18.4/defconfig
@@ -518,7 +518,7 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
 CONFIG_LOSETUP=y
 # CONFIG_LSPCI is not set
 # CONFIG_LSUSB is not set
-# CONFIG_MDEV is not set
+CONFIG_MDEV=y
 # CONFIG_FEATURE_MDEV_CONF is not set
 # CONFIG_FEATURE_MDEV_RENAME is not set
 # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 341c5c4..de711d2 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -29,7 +29,6 @@ INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ."
 INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" 
 INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc" 
 CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${PN}"
-CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf"
 
 RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc"
 
diff --git a/meta/recipes-core/busybox/busybox_1.18.4.bb b/meta/recipes-core/busybox/busybox_1.18.4.bb
index cf37650..a5080d5 100644
--- a/meta/recipes-core/busybox/busybox_1.18.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.18.4.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://udhcpscript.patch \
-- 
1.7.2.5

[PATCH 3/3] syslinux: rdepends on mtools

[Otavio Salvador]

To be able to install into a disk, mtools are required thus we add it
as rdepends of 'syslinux' package.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-devtools/syslinux/syslinux_4.03.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/syslinux/syslinux_4.03.bb b/meta/recipes-devtools/syslinux/syslinux_4.03.bb
index dc0785e..e76fe1f 100644
--- a/meta/recipes-devtools/syslinux/syslinux_4.03.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_4.03.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 # If you really want to run syslinux, you need mtools.  We just want the
 # ldlinux.* stuff for now, so skip mtools-native
 DEPENDS = "nasm-native"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 \
            file://cross-build.patch"
@@ -48,6 +48,8 @@ do_install() {
 
 PACKAGES =+ "${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux"
 
+RDEPENDS_${PN} += "mtools"
+
 FILES_${PN} = "${bindir}/syslinux"
 FILES_${PN}-extlinux = "${sbindir}/extlinux"
 FILES_${PN}-mbr = "${libdir}/${PN}/mbr.bin"
-- 
1.7.2.5

Re: [PATCH 2/3] busybox: enable mdev by default

[Phil Blundell]

On Mon, 2011-05-23 at 12:13 +0000, Otavio Salvador wrote:
>  CONFIG_LOSETUP=y
>  # CONFIG_LSPCI is not set
>  # CONFIG_LSUSB is not set
> -# CONFIG_MDEV is not set
> +CONFIG_MDEV=y
>  # CONFIG_FEATURE_MDEV_CONF is not set
>  # CONFIG_FEATURE_MDEV_RENAME is not set
>  # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set

This sort of thing, as we've seen previously in classic oe, doesn't
really scale very well since everyone's requirements for busybox are
subtly different.  Others will doubtless disagree but, personally, I
think it would be best for you to just maintain a busybox.conf in your
own distro layer which sets it up the way that you want.

> diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
> index 341c5c4..de711d2 100644
> --- a/meta/recipes-core/busybox/busybox.inc
> +++ b/meta/recipes-core/busybox/busybox.inc
> @@ -29,7 +29,6 @@ INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ."
>  INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" 
>  INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc" 
>  CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${PN}"
> -CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf"

Agreed, it seems silly to declare the file as a CONFFILE if we aren't
shipping it in the first place.

p.

Re: [PATCH 2/3] busybox: enable mdev by default

[Otavio Salvador]

On Mon, May 23, 2011 at 13:06, Phil Blundell <pb@pbcl.net> wrote:
> On Mon, 2011-05-23 at 12:13 +0000, Otavio Salvador wrote:
>>  CONFIG_LOSETUP=y
>>  # CONFIG_LSPCI is not set
>>  # CONFIG_LSUSB is not set
>> -# CONFIG_MDEV is not set
>> +CONFIG_MDEV=y
>>  # CONFIG_FEATURE_MDEV_CONF is not set
>>  # CONFIG_FEATURE_MDEV_RENAME is not set
>>  # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
>
> This sort of thing, as we've seen previously in classic oe, doesn't
> really scale very well since everyone's requirements for busybox are
> subtly different.  Others will doubtless disagree but, personally, I
> think it would be best for you to just maintain a busybox.conf in your
> own distro layer which sets it up the way that you want.

Yes.

>> diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
>> index 341c5c4..de711d2 100644
>> --- a/meta/recipes-core/busybox/busybox.inc
>> +++ b/meta/recipes-core/busybox/busybox.inc
>> @@ -29,7 +29,6 @@ INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ."
>>  INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
>>  INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc"
>>  CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${PN}"
>> -CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf"
>
> Agreed, it seems silly to declare the file as a CONFFILE if we aren't
> shipping it in the first place.

The idea is to not require it to be declared and do the right thing by default.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [PATCH 0/3] Pull request with misc fixes from O.S. Systems tree

[Saul Wold]

On 05/23/2011 05:13 AM, Otavio Salvador wrote:
> The following changes since commit 54ecf8e3992b8a01c2e5bd16720e1819b71b68bd:
>
>    packagedata: don't choke on empty PACKAGES (2011-05-20 17:41:34 +0100)
>
> are available in the git repository at:
>    git://github.com/OSSystems/oe-core.git master
>    https://github.com/OSSystems/oe-core/tree/master
>
> Otavio Salvador (3):
>    send-pull-request: drop sendemail checks
>    busybox: enable mdev by default
>    syslinux: rdepends on mtools
>
>   meta/recipes-core/busybox/busybox-1.18.4/defconfig |    2 +-
>   meta/recipes-core/busybox/busybox.inc              |    1 -
>   meta/recipes-core/busybox/busybox_1.18.4.bb        |    2 +-
>   meta/recipes-devtools/syslinux/syslinux_4.03.bb    |    4 +++-
>   scripts/send-pull-request                          |   16 ----------------
>   5 files changed, 5 insertions(+), 20 deletions(-)
>
Pulled the changes to send-pull-request and syslinux, did not take the
mdev by default change.

Thanks
	Sau!