[PATCH 0/5] Misc fixes

Openembedded Core Discussions
 help / color / mirror / Atom feed

* [PATCH 0/5] Misc fixes
@ 2011-11-04 18:20 Otavio Salvador
  2011-11-04 18:20 ` [PATCH 1/5] libcap: fix sstate for native package Otavio Salvador
                   ` (5 more replies)
  0 siblings, 6 replies; 10+ messages in thread
From: Otavio Salvador @ 2011-11-04 18:20 UTC (permalink / raw)
  To: openembedded-core

The following changes since commit e3c003282afb93ec52882496400b042620ab00ef:

  rt-tests: update to 0.83 (2011-11-04 15:43:19 +0000)

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

Otavio Salvador (5):
  libcap: fix sstate for native package
  files/device_table-minimal.txt: add /dev/kmsg
  dhcp: drop unused dhcp3.inc file
  dhcp: rename dhcp4.inc to dhcp.inc
  dhcp: move server configuration to dhcp-server-config

 meta/files/device_table-minimal.txt                |    1 +
 .../dhcp/{dhcp4.inc => dhcp.inc}                   |   10 +++-
 meta/recipes-connectivity/dhcp/dhcp3.inc           |   49 --------------------
 meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb       |    4 +-
 meta/recipes-support/libcap/libcap.inc             |   15 +++++-
 meta/recipes-support/libcap/libcap_2.22.bb         |    2 +-
 6 files changed, 24 insertions(+), 57 deletions(-)
 rename meta/recipes-connectivity/dhcp/{dhcp4.inc => dhcp.inc} (91%)
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp3.inc

-- 
1.7.2.5




^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH 1/5] libcap: fix sstate for native package
  2011-11-04 18:20 [PATCH 0/5] Misc fixes Otavio Salvador
@ 2011-11-04 18:20 ` Otavio Salvador
  2011-11-04 18:20 ` [PATCH 2/5] files/device_table-minimal.txt: add /dev/kmsg Otavio Salvador
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 10+ messages in thread
From: Otavio Salvador @ 2011-11-04 18:20 UTC (permalink / raw)
  To: openembedded-core

The 'lib' option needs to be given on target and native builds
otherwise it installs the binaries at ${libdir}64 when host is 64bit.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-support/libcap/libcap.inc     |   15 ++++++++++++---
 meta/recipes-support/libcap/libcap_2.22.bb |    2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index 3506530..184b58a 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -21,9 +21,18 @@ do_configure() {
 	sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules
 }
 
-EXTRA_OEMAKE = "LIBATTR=yes PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no"
-EXTRA_OEMAKE_virtclass-native = "LIBATTR=no PAM_CAP=no INDENT= "
-EXTRA_OEMAKE += " lib=${@os.path.basename('${libdir}')}"
+EXTRA_OEMAKE = " \
+  LIBATTR=yes \
+  PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \
+  INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no \
+  lib=${@os.path.basename('${libdir}')} \
+"
+EXTRA_OEMAKE_virtclass-native = " \
+  LIBATTR=no \
+  PAM_CAP=no \
+  INDENT= \
+  lib=${@os.path.basename('${libdir}')} \
+"
 
 do_compile() {
 	oe_runmake
diff --git a/meta/recipes-support/libcap/libcap_2.22.bb b/meta/recipes-support/libcap/libcap_2.22.bb
index a31ba3f..dd63d9e 100644
--- a/meta/recipes-support/libcap/libcap_2.22.bb
+++ b/meta/recipes-support/libcap/libcap_2.22.bb
@@ -1,6 +1,6 @@
 require libcap.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[md5sum] = "ce64058bdb3f086ddbfca8ce6c919845"
 SRC_URI[sha256sum] = "73ebbd4877b5f69dd28b72098e510c5b318bc480f8201c4061ac98b78c04050f"
-- 
1.7.2.5




^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH 2/5] files/device_table-minimal.txt: add /dev/kmsg
  2011-11-04 18:20 [PATCH 0/5] Misc fixes Otavio Salvador
  2011-11-04 18:20 ` [PATCH 1/5] libcap: fix sstate for native package Otavio Salvador
@ 2011-11-04 18:20 ` Otavio Salvador
  2011-11-04 18:20 ` [PATCH 3/5] dhcp: drop unused dhcp3.inc file Otavio Salvador
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 10+ messages in thread
From: Otavio Salvador @ 2011-11-04 18:20 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/files/device_table-minimal.txt |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/files/device_table-minimal.txt b/meta/files/device_table-minimal.txt
index 495b5d5..c6e5463 100644
--- a/meta/files/device_table-minimal.txt
+++ b/meta/files/device_table-minimal.txt
@@ -15,6 +15,7 @@
 /dev/hda	b	660	0	6	3	0	-	-	-
 /dev/hda	b	660	0	6	3	1	1	1	20
 /dev/kmem	c	640	0	15	1	2	-	-	-
+/dev/kmsg	c	600	0	0	1	11	-	-	-
 /dev/mem	c	640	0	15	1	1	-	-	-
 /dev/null	c	666	0	0	1	3	-	-	-
 /dev/ram	b	640	0	0	1	0	0	1	4
-- 
1.7.2.5




^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH 3/5] dhcp: drop unused dhcp3.inc file
  2011-11-04 18:20 [PATCH 0/5] Misc fixes Otavio Salvador
  2011-11-04 18:20 ` [PATCH 1/5] libcap: fix sstate for native package Otavio Salvador
  2011-11-04 18:20 ` [PATCH 2/5] files/device_table-minimal.txt: add /dev/kmsg Otavio Salvador
@ 2011-11-04 18:20 ` Otavio Salvador
  2011-11-04 18:20 ` [PATCH 4/5] dhcp: rename dhcp4.inc to dhcp.inc Otavio Salvador
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 10+ messages in thread
From: Otavio Salvador @ 2011-11-04 18:20 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-connectivity/dhcp/dhcp3.inc |   49 ------------------------------
 1 files changed, 0 insertions(+), 49 deletions(-)
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp3.inc

diff --git a/meta/recipes-connectivity/dhcp/dhcp3.inc b/meta/recipes-connectivity/dhcp/dhcp3.inc
deleted file mode 100644
index 6c7483e..0000000
--- a/meta/recipes-connectivity/dhcp/dhcp3.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-SECTION = "console/network"
-DESCRIPTION = "Internet Software Consortium DHCP package"
-HOMEPAGE = "http://www.isc.org/"
-
-LICENSE = "ISC"
-LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=bb6fd41f5895b67088ebea61ad365e74"
-
-SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \
-	   file://init-relay file://default-relay \
-	   file://init-server file://default-server \
-	   file://dhclient.conf file://dhcpd.conf"
-
-inherit autotools
-
-TARGET_CFLAGS += "-D_GNU_SOURCE"
-
-do_compile() {
-	make RANLIB=${RANLIB} PREDEFINES='-D_PATH_DHCPD_DB=\"/var/lib/dhcp/dhcpd.leases\" \
-        -D_PATH_DHCLIENT_DB=\"/var/lib/dhcp/dhclient.leases\" \
-        -D_PATH_DHCLIENT_SCRIPT=\"/sbin/dhclient-script\" \
-        -D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \
-        -D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"'
-}
-
-do_install() {
-	make -e DESTDIR=${D} USRMANDIR=${mandir}/man1 ADMMANDIR=${mandir}/man8 FFMANDIR=${mandir}/man5 LIBMANDIR=${mandir}/man3 LIBDIR=${libdir} INCDIR=${includedir} install
-	install -d ${D}${sysconfdir}/init.d
-	install -d ${D}${sysconfdir}/default
-	install -d ${D}${sysconfdir}/dhcp
-	install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay
-	install -m 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay
-	install -m 0755 ${WORKDIR}/init-server ${D}${sysconfdir}/init.d/dhcp-server
-	install -m 0644 ${WORKDIR}/default-server ${D}${sysconfdir}/default/dhcp-server
-	install -m 0644 ${WORKDIR}/dhclient.conf ${D}${sysconfdir}/dhcp/dhclient.conf
-	install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf
-	install -d ${D}${base_sbindir}/
-	mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
-	install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script
-}
-
-PACKAGES += "dhcp-server dhcp-client dhcp-relay dhcp-omshell"
-FILES_${PN} = ""
-FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server ${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf"
-FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay"
-
-FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf"
-RDEPENDS_dhcp-client = "bash"
-
-FILES_dhcp-omshell = "${bindir}/omshell"
-- 
1.7.2.5




^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH 4/5] dhcp: rename dhcp4.inc to dhcp.inc
  2011-11-04 18:20 [PATCH 0/5] Misc fixes Otavio Salvador
                   ` (2 preceding siblings ...)
  2011-11-04 18:20 ` [PATCH 3/5] dhcp: drop unused dhcp3.inc file Otavio Salvador
@ 2011-11-04 18:20 ` Otavio Salvador
  2011-11-04 21:17   ` Phil Blundell
  2011-11-04 18:20 ` [PATCH 5/5] dhcp: move server configuration to dhcp-server-config Otavio Salvador
  2011-11-08 22:59 ` [PATCH 0/5] Misc fixes Saul Wold
  5 siblings, 1 reply; 10+ messages in thread
From: Otavio Salvador @ 2011-11-04 18:20 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../dhcp/{dhcp4.inc => dhcp.inc}                   |    0
 meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb       |    2 +-
 2 files changed, 1 insertions(+), 1 deletions(-)
 rename meta/recipes-connectivity/dhcp/{dhcp4.inc => dhcp.inc} (100%)

diff --git a/meta/recipes-connectivity/dhcp/dhcp4.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
similarity index 100%
rename from meta/recipes-connectivity/dhcp/dhcp4.inc
rename to meta/recipes-connectivity/dhcp/dhcp.inc
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
index 85f473d..223522f 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
@@ -1,4 +1,4 @@
-require dhcp4.inc
+require dhcp.inc
 
 PR = "r2"
 
-- 
1.7.2.5




^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCH 4/5] dhcp: rename dhcp4.inc to dhcp.inc
  2011-11-04 18:20 ` [PATCH 4/5] dhcp: rename dhcp4.inc to dhcp.inc Otavio Salvador
@ 2011-11-04 21:17   ` Phil Blundell
  2011-11-05 20:42     ` Otavio Salvador
  0 siblings, 1 reply; 10+ messages in thread
From: Phil Blundell @ 2011-11-04 21:17 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On Fri, 2011-11-04 at 18:20 +0000, Otavio Salvador wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  .../dhcp/{dhcp4.inc => dhcp.inc}                   |    0
>  meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb       |    2 +-
>  2 files changed, 1 insertions(+), 1 deletions(-)
>  rename meta/recipes-connectivity/dhcp/{dhcp4.inc => dhcp.inc} (100%)

Why is this patch an improvement?  I don't have anything against it
particularly but it doesn't seem that it buys much either, and there is
no clue in the commit message as to what it is trying to achieve.

p.





^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 4/5] dhcp: rename dhcp4.inc to dhcp.inc
  2011-11-04 21:17   ` Phil Blundell
@ 2011-11-05 20:42     ` Otavio Salvador
  0 siblings, 0 replies; 10+ messages in thread
From: Otavio Salvador @ 2011-11-05 20:42 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On Fri, Nov 4, 2011 at 19:17, Phil Blundell <philb@gnu.org> wrote:
> Why is this patch an improvement?  I don't have anything against it
> particularly but it doesn't seem that it buys much either, and there is
> no clue in the commit message as to what it is trying to achieve.

Since we dropped the dhcp3.inc file makes no sense to have it named
dhcp4.inc so I renamed it. Just as simple as that.

-- 
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



^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH 5/5] dhcp: move server configuration to dhcp-server-config
  2011-11-04 18:20 [PATCH 0/5] Misc fixes Otavio Salvador
                   ` (3 preceding siblings ...)
  2011-11-04 18:20 ` [PATCH 4/5] dhcp: rename dhcp4.inc to dhcp.inc Otavio Salvador
@ 2011-11-04 18:20 ` Otavio Salvador
  2011-11-08 22:59 ` [PATCH 0/5] Misc fixes Saul Wold
  5 siblings, 0 replies; 10+ messages in thread
From: Otavio Salvador @ 2011-11-04 18:20 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-connectivity/dhcp/dhcp.inc      |   10 ++++++++--
 meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb |    2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index bdaa5e9..1cc529d 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -53,9 +53,15 @@ do_install_append () {
 	install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script
 }
 
-PACKAGES += "dhcp-server dhcp-client dhcp-relay dhcp-omshell"
+PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell"
+
 FILES_${PN} = ""
-FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server ${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf"
+
+FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server"
+RRECOMMENDS_dhcp-server = "dhcp-server-config"
+
+FILES_dhcp-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf"
+
 FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay"
 
 FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf"
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
index 223522f..8ed7d76 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
@@ -1,6 +1,6 @@
 require dhcp.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://fixincludes.patch \
             file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
-- 
1.7.2.5




^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCH 0/5] Misc fixes
  2011-11-04 18:20 [PATCH 0/5] Misc fixes Otavio Salvador
                   ` (4 preceding siblings ...)
  2011-11-04 18:20 ` [PATCH 5/5] dhcp: move server configuration to dhcp-server-config Otavio Salvador
@ 2011-11-08 22:59 ` Saul Wold
  5 siblings, 0 replies; 10+ messages in thread
From: Saul Wold @ 2011-11-08 22:59 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On 11/04/2011 11:20 AM, Otavio Salvador wrote:
> The following changes since commit e3c003282afb93ec52882496400b042620ab00ef:
>
>    rt-tests: update to 0.83 (2011-11-04 15:43:19 +0000)
>
> are available in the git repository at:
>    git://github.com/OSSystems/oe-core master
>    https://github.com/OSSystems/oe-core/tree/HEAD
>
> Otavio Salvador (5):
>    libcap: fix sstate for native package
>    files/device_table-minimal.txt: add /dev/kmsg
>    dhcp: drop unused dhcp3.inc file
>    dhcp: rename dhcp4.inc to dhcp.inc
>    dhcp: move server configuration to dhcp-server-config
>
>   meta/files/device_table-minimal.txt                |    1 +
>   .../dhcp/{dhcp4.inc =>  dhcp.inc}                   |   10 +++-
>   meta/recipes-connectivity/dhcp/dhcp3.inc           |   49 --------------------
>   meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb       |    4 +-
>   meta/recipes-support/libcap/libcap.inc             |   15 +++++-
>   meta/recipes-support/libcap/libcap_2.22.bb         |    2 +-
>   6 files changed, 24 insertions(+), 57 deletions(-)
>   rename meta/recipes-connectivity/dhcp/{dhcp4.inc =>  dhcp.inc} (91%)
>   delete mode 100644 meta/recipes-connectivity/dhcp/dhcp3.inc
>
Merged to OE-Core

Thanks
	Sau!



^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH 0/5] Misc fixes
@ 2015-08-20  8:31 Paul Eggleton
  0 siblings, 0 replies; 10+ messages in thread
From: Paul Eggleton @ 2015-08-20  8:31 UTC (permalink / raw)
  To: openembedded-core

Generally I prefer to avoid lumping a bunch of unrelated fixes together,
but I've been hanging onto these for a couple of weeks now and I'm not
sure when I'll have any related changes to send them with, so here they
are now.


The following changes since commit c38acd720b3f6ffbeb544063692eb471dada8593:

  binconfig-disabled: write an message to stderr to help confused developers (2015-08-19 17:57:58 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib paule/oecore-fixes
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/oecore-fixes

Paul Eggleton (5):
  scripts/create-recipe: drop
  classes/insane: fix QA check message referring to nativesdk
  oe-selftest: replace assertTrue(False, ...) with fail(...)
  hello-mod: drop PV and PR
  service: tweak example recipe

 .../recipes-kernel/hello-mod/hello-mod_0.1.bb      |    3 -
 .../recipes-skeleton/service/service_0.1.bb        |    7 +-
 meta/classes/insane.bbclass                        |    2 +-
 meta/lib/oeqa/selftest/devtool.py                  |    2 +-
 meta/lib/oeqa/selftest/recipetool.py               |    4 +-
 scripts/create-recipe                              | 2071 --------------------
 6 files changed, 7 insertions(+), 2082 deletions(-)
 delete mode 100755 scripts/create-recipe

-- 
2.1.0



^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2015-08-20  8:32 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-04 18:20 [PATCH 0/5] Misc fixes Otavio Salvador
2011-11-04 18:20 ` [PATCH 1/5] libcap: fix sstate for native package Otavio Salvador
2011-11-04 18:20 ` [PATCH 2/5] files/device_table-minimal.txt: add /dev/kmsg Otavio Salvador
2011-11-04 18:20 ` [PATCH 3/5] dhcp: drop unused dhcp3.inc file Otavio Salvador
2011-11-04 18:20 ` [PATCH 4/5] dhcp: rename dhcp4.inc to dhcp.inc Otavio Salvador
2011-11-04 21:17   ` Phil Blundell
2011-11-05 20:42     ` Otavio Salvador
2011-11-04 18:20 ` [PATCH 5/5] dhcp: move server configuration to dhcp-server-config Otavio Salvador
2011-11-08 22:59 ` [PATCH 0/5] Misc fixes Saul Wold
  -- strict thread matches above, loose matches on Subject: below --
2015-08-20  8:31 Paul Eggleton

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox