* [PATCH 1/3] dbus: remove unused initscript
2011-10-23 15:07 [PATCH 0/3] Misc metadata fixes Paul Eggleton
@ 2011-10-23 15:07 ` Paul Eggleton
2011-10-23 15:07 ` [PATCH 2/3] util-linux: split out mkfs into its own package Paul Eggleton
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Paul Eggleton @ 2011-10-23 15:07 UTC (permalink / raw)
To: openembedded-core
We already install an appropriate init script to /etc/init.d, we do not
need an additional one in /etc/init.d/rc.d as well.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-core/dbus/dbus.inc | 3 +++
meta/recipes-core/dbus/dbus_1.4.12.bb | 3 +++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index a8ecda8..339bedf 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -92,6 +92,9 @@ do_install() {
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
+ # Remove Red Hat initscript
+ rm -rf ${D}${sysconfdir}/rc.d
+
# disable dbus-1 sysv script on systemd installs
# nearly all distros call the initscript plain 'dbus', but OE-core is different
ln -sf /dev/null ${D}/${base_libdir}/systemd/system/dbus-1.service
diff --git a/meta/recipes-core/dbus/dbus_1.4.12.bb b/meta/recipes-core/dbus/dbus_1.4.12.bb
index ada53c9..9324af7 100644
--- a/meta/recipes-core/dbus/dbus_1.4.12.bb
+++ b/meta/recipes-core/dbus/dbus_1.4.12.bb
@@ -1,4 +1,7 @@
include dbus.inc
+
+PR = "r1"
+
SRC_URI[md5sum] = "104f2ea94c10a896dfb1edecb5714cb1"
SRC_URI[sha256sum] = "da3c97fd546610558d588799e27c4fa81101e754acbcd34747a42c131f30dbe7"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] util-linux: split out mkfs into its own package
2011-10-23 15:07 [PATCH 0/3] Misc metadata fixes Paul Eggleton
2011-10-23 15:07 ` [PATCH 1/3] dbus: remove unused initscript Paul Eggleton
@ 2011-10-23 15:07 ` Paul Eggleton
2011-10-23 15:07 ` [PATCH 3/3] e2fsprogs: move mke2fs.conf to e2fsprogs-mke2fs package Paul Eggleton
2011-11-01 11:53 ` [PATCH 0/3] Misc metadata fixes Paul Eggleton
3 siblings, 0 replies; 6+ messages in thread
From: Paul Eggleton @ 2011-10-23 15:07 UTC (permalink / raw)
To: openembedded-core
For those external tools such as Webmin that call mkfs to do formatting
operations, it is useful to have it in its own package to avoid dragging
in the rest of util-linux.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-core/util-linux/util-linux.inc | 6 ++++--
meta/recipes-core/util-linux/util-linux_2.19.1.bb | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 67d81b9..d10bafb 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -29,7 +29,8 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
util-linux-swaponoff util-linux-losetup util-linux-umount \
util-linux-mount util-linux-readprofile util-linux-libblkid \
util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
- util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid"
+ util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
+ util-linux-mkfs"
EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \
--enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \
@@ -55,13 +56,14 @@ FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${libdir}/libuuid.a ${libdi
FILES_util-linux-lscpu = "${bindir}/lscpu"
FILES_util-linux-fsck = "${base_sbindir}/fsck*"
+FILES_util-linux-mkfs = "${sbindir}/mkfs"
# Util-linux' blkid replaces the e2fsprogs one
FILES_util-linux-blkid = "${base_sbindir}/blkid*"
RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid"
RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
-RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile "
+RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs "
RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup perl"
RRECOMMENDS_${PN}_virtclass-native = ""
diff --git a/meta/recipes-core/util-linux/util-linux_2.19.1.bb b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
index 04f4457..fb5637e 100644
--- a/meta/recipes-core/util-linux/util-linux_2.19.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
@@ -1,5 +1,5 @@
MAJOR_VERSION = "2.19"
-PR = "r8"
+PR = "r9"
require util-linux.inc
# note that `lscpu' is under GPLv3+
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/3] e2fsprogs: move mke2fs.conf to e2fsprogs-mke2fs package
2011-10-23 15:07 [PATCH 0/3] Misc metadata fixes Paul Eggleton
2011-10-23 15:07 ` [PATCH 1/3] dbus: remove unused initscript Paul Eggleton
2011-10-23 15:07 ` [PATCH 2/3] util-linux: split out mkfs into its own package Paul Eggleton
@ 2011-10-23 15:07 ` Paul Eggleton
2011-11-01 11:53 ` [PATCH 0/3] Misc metadata fixes Paul Eggleton
3 siblings, 0 replies; 6+ messages in thread
From: Paul Eggleton @ 2011-10-23 15:07 UTC (permalink / raw)
To: openembedded-core
mke2fs.conf, which contains defaults for filesystem formatting options,
ought to be shipped along with mke2fs itself.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../e2fsprogs/e2fsprogs_1.41.14.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
index 1fca7b9..c6c1f0d 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
@@ -1,6 +1,6 @@
require e2fsprogs.inc
-PR = "r2"
+PR = "r3"
SRC_URI += "file://quotefix.patch \
file://acinclude.m4"
@@ -44,7 +44,7 @@ PACKAGES =+ "libcomerr libss libe2p libext2fs"
FILES_e2fsprogs-blkid = "${base_sbindir}/blkid"
FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
-FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*"
+FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf"
FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
FILES_libcomerr = "${libdir}/libcom_err.so.*"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/3] Misc metadata fixes
2011-10-23 15:07 [PATCH 0/3] Misc metadata fixes Paul Eggleton
` (2 preceding siblings ...)
2011-10-23 15:07 ` [PATCH 3/3] e2fsprogs: move mke2fs.conf to e2fsprogs-mke2fs package Paul Eggleton
@ 2011-11-01 11:53 ` Paul Eggleton
2011-11-01 14:52 ` Richard Purdie
3 siblings, 1 reply; 6+ messages in thread
From: Paul Eggleton @ 2011-11-01 11:53 UTC (permalink / raw)
To: openembedded-core
On Sunday 23 October 2011 16:07:14 Paul Eggleton wrote:
> The following changes since commit 99da9a4e65f9dffb04efc3ad60125194c476d6b3:
>
> distro-tracking-fields: update fields for tzdata and gst-plugins-good
> (2011-10-20 13:07:16 +0100)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib paule/fixes7
>
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paul
> e/fixes7
>
> Paul Eggleton (3):
> dbus: remove unused initscript
> util-linux: split out mkfs into its own package
> e2fsprogs: move mke2fs.conf to e2fsprogs-mke2fs package
>
> meta/recipes-core/dbus/dbus.inc | 3 +++
> meta/recipes-core/dbus/dbus_1.4.12.bb | 3 +++
> meta/recipes-core/util-linux/util-linux.inc | 6 ++++--
> meta/recipes-core/util-linux/util-linux_2.19.1.bb | 2 +-
> .../e2fsprogs/e2fsprogs_1.41.14.bb | 4 ++--
> 5 files changed, 13 insertions(+), 5 deletions(-)
Ping...?
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 0/3] Misc metadata fixes
2011-11-01 11:53 ` [PATCH 0/3] Misc metadata fixes Paul Eggleton
@ 2011-11-01 14:52 ` Richard Purdie
0 siblings, 0 replies; 6+ messages in thread
From: Richard Purdie @ 2011-11-01 14:52 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2011-11-01 at 11:53 +0000, Paul Eggleton wrote:
> On Sunday 23 October 2011 16:07:14 Paul Eggleton wrote:
> > The following changes since commit 99da9a4e65f9dffb04efc3ad60125194c476d6b3:
> >
> > distro-tracking-fields: update fields for tzdata and gst-plugins-good
> > (2011-10-20 13:07:16 +0100)
> >
> > are available in the git repository at:
> > git://git.openembedded.org/openembedded-core-contrib paule/fixes7
> >
> > http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paul
> > e/fixes7
> >
> > Paul Eggleton (3):
> > dbus: remove unused initscript
> > util-linux: split out mkfs into its own package
> > e2fsprogs: move mke2fs.conf to e2fsprogs-mke2fs package
> >
> > meta/recipes-core/dbus/dbus.inc | 3 +++
> > meta/recipes-core/dbus/dbus_1.4.12.bb | 3 +++
> > meta/recipes-core/util-linux/util-linux.inc | 6 ++++--
> > meta/recipes-core/util-linux/util-linux_2.19.1.bb | 2 +-
> > .../e2fsprogs/e2fsprogs_1.41.14.bb | 4 ++--
> > 5 files changed, 13 insertions(+), 5 deletions(-)
>
> Ping...?
These got merged to master last night, updates on the list haven't quite
caught up yet :)
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread