Skip to contentSkip to conversation

Pull request with misc fixes from O.S. Systems tree

PATCH In review Otavio Salvador 3 participants 7 messages May 23, 2011 – May 25, 2011

lore
Share & tools
lore

Otavio Salvador

author
#0 lore raw

cover Pull request with misc fixes from O.S. Systems tree

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(-)
Signature · 1 line
1.7.2.5
author
#1 lore raw

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

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 <[email protected]>
Acked-by Darren Hart <[email protected]>
---
 scripts/send-pull-request |   16 ----------------
 1 files changed, 0 insertions(+), 16 deletions(-)
scripts/send-pull-request +0 -16
index cee9253..5dfc246 100755
@@ -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
Signature · 1 line
1.7.2.5
author
#2 lore raw

PATCH 2/3 busybox: enable mdev by default

In reply to 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 <[email protected]>
---
 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(-)
meta/recipes-core/busybox/busybox-1.18.4/defconfig +1 -1
index 5327a64..6b48cc1 100644
@@ -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
meta/recipes-core/busybox/busybox.inc +0 -1
index 341c5c4..de711d2 100644
@@ -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"
meta/recipes-core/busybox/busybox_1.18.4.bb +1 -1
index cf37650..a5080d5 100644
@@ -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 \
Signature · 1 line
1.7.2.5
#3 lore raw

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

meta/recipes-core/busybox/busybox-1.18.4/defconfig CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y · line 524

Quoted 8 lines · Otavio Salvador

CONFIG_LOSETUP=y
# CONFIG_LSPCI is not set
# CONFIG_LSUSB is not set

meta/recipes-core/busybox/busybox-1.18.4/defconfig +1 -1
-# 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.

meta/recipes-core/busybox/busybox.inc INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ." · line 32

Quoted 9 lines
meta/recipes-core/busybox/busybox.inc +0 -1
index 341c5c4..de711d2 100644
@@ -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.

author
#4 lore raw

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

Quoted 15 lines · Phil Blundell
Quoted 8 lines · Otavio Salvador

 CONFIG_LOSETUP=y
 # CONFIG_LSPCI is not set
 # CONFIG_LSUSB is not set

meta/recipes-core/busybox/busybox-1.18.4/defconfig +1 -1
-# 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.

Quoted 4 lines
Quoted 4 lines
meta/recipes-core/busybox/busybox.inc +0 -0
index 341c5c4..de711d2 100644
Quoted 8 lines
Quoted 5 lines
meta/recipes-core/busybox/busybox.inc +0 -0
@@ -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.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
author
#5 lore raw

PATCH 3/3 syslinux: rdepends on mtools

In reply to 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 <[email protected]>
---
 meta/recipes-devtools/syslinux/syslinux_4.03.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
meta/recipes-devtools/syslinux/syslinux_4.03.bb +3 -1
index dc0785e..e76fe1f 100644
@@ -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"
Signature · 1 line
1.7.2.5
#6 lore raw
In reply to Otavio Salvador
Quoted 13 lines · 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

Quoted 7 lines
  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!