busybox-mountall util-linux-ng-mountall collision on /etc/default/mountall
Hi,
util-linux-ng.inc has
RREPLACES_${PN}-mountall = "busybox-mountall"
but it still doesn't prevent to have both installed and opkg upgrade fails
Collected errors:
* check_data_file_clashes: Package busybox-mountall wants to install file /etc/default/mountall But that file is already provided by package * check_data_file_clashes: util-linux-ng-mountall
We can use u-a for that config as suggested in 2 following patches, or add maybe RCONFLICTS_${PN}-mountall = "busybox-mountall"
and lowering RDEPENDS to RRECOMENDS for ${PN}-mountall would be enough.
What do you prefer?
If nobody reply today, I'll push this with u-a.
Regards
PATCH 1/2 busybox: use u-a for /etc/default/mountall (collision with util-linux-ng-mountall)
--- recipes/busybox/busybox.inc | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-)
recipes/busybox/busybox.inc +10 -3
@@ -11,7 +11,7 @@ LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -INC_PR = "r25" +INC_PR = "r26" SRC_URI = "\ file://busybox-cron \
@@ -39,7 +39,7 @@ PACKAGES =+ "${PN}-mountall ${PN}-httpd ${PN}-syslog ${PN}-udhcpd" # listed in the NEEDED field. RRECOMMENDS += "libgcc" -FILES_${PN}-mountall = "${sysconfdir}/default/mountall" +FILES_${PN}-mountall = "${sysconfdir}/default/mountall.${PN}" RDEPENDS_${PN} += "${PN}-mountall" # Make busybox recommend busybox-syslog for those images that expect it
@@ -128,7 +128,7 @@ do_install () { fi if grep "CONFIG_FEATURE_MOUNT_FSTAB=y" ${WORKDIR}/defconfig; then install -d ${D}${sysconfdir}/default - install -m 644 ${WORKDIR}/mountall ${D}${sysconfdir}/default/ + install -m 644 ${WORKDIR}/mountall ${D}${sysconfdir}/default/mountall.${PN} fi install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
@@ -145,6 +145,13 @@ pkg_postinst_${PN} () { while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; /*) to="/bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links } +pkg_postinst_${PN}-mountall () { + update-alternatives --install ${sysconfdir}/default/mountall default_mountall mountall.${PN} 50 +} +pkg_prerm_${PN}-mountall () { + update-alternatives --remove default_mountall mountall.${PN} +} + pkg_prerm_${PN} () { # This is so you can make busybox commit suicide - removing busybox with no other packages # providing its files, this will make update-alternatives work, but the update-rc.d part
Signature · 1 line
1.7.0
Re: [PATCH 1/2] busybox: use u-a for /etc/default/mountall (collision with util-linux-ng-mountall)
On (05/03/10 12:55), Martin Jansa wrote:
Quoted 57 lines
--- recipes/busybox/busybox.inc | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-)recipes/busybox/busybox.inc +10
-3@@ -11,7 +11,7 @@ LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -INC_PR = "r25" +INC_PR = "r26" SRC_URI = "\ file://busybox-cron \@@ -39,7 +39,7 @@ PACKAGES =+ "${PN}-mountall ${PN}-httpd ${PN}-syslog ${PN}-udhcpd" # listed in the NEEDED field. RRECOMMENDS += "libgcc" -FILES_${PN}-mountall = "${sysconfdir}/default/mountall" +FILES_${PN}-mountall = "${sysconfdir}/default/mountall.${PN}" RDEPENDS_${PN} += "${PN}-mountall" # Make busybox recommend busybox-syslog for those images that expect it@@ -128,7 +128,7 @@ do_install () { fi if grep "CONFIG_FEATURE_MOUNT_FSTAB=y" ${WORKDIR}/defconfig; then install -d ${D}${sysconfdir}/default - install -m 644 ${WORKDIR}/mountall ${D}${sysconfdir}/default/ + install -m 644 ${WORKDIR}/mountall ${D}${sysconfdir}/default/mountall.${PN} fi install -m 0644 ${S}/busybox.links ${D}${sysconfdir}@@ -145,6 +145,13 @@ pkg_postinst_${PN} () { while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; /*) to="/bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links } +pkg_postinst_${PN}-mountall () { + update-alternatives --install ${sysconfdir}/default/mountall default_mountall mountall.${PN} 50 +} +pkg_prerm_${PN}-mountall () { + update-alternatives --remove default_mountall mountall.${PN} +} + pkg_prerm_${PN} () { # This is so you can make busybox commit suicide - removing busybox with no other packages # providing its files, this will make update-alternatives work, but the update-rc.d partSignature · 7 lines
1.7.0 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
PATCH 2/2 util-linux-ng: use u-a for /etc/default/mountall (collision with busybox-mountall)
In reply to Martin Jansa--- recipes/util-linux-ng/util-linux-ng.inc | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-)
recipes/util-linux-ng/util-linux-ng.inc +10 -3
@@ -7,7 +7,7 @@ inherit autotools DEFAULT_PREFERENCE = "-1" -INC_PR = "r9" +INC_PR = "r10" # allows for a release candidate RC ?= ""
@@ -46,7 +46,7 @@ FILES_util-linux-ng-umount = "${base_bindir}/umount.${PN}" FILES_util-linux-ng-readprofile = "${base_sbindir}/readprofile.${PN}" PACKAGES =+ "${PN}-mountall" -FILES_${PN}-mountall = "${sysconfdir}/default/mountall" +FILES_${PN}-mountall = "${sysconfdir}/default/mountall.${PN}" RREPLACES_${PN}-mountall = "busybox-mountall" RRECOMMENDS_${PN} = "util-linux-ng-fdisk util-linux-ng-cfdisk util-linux-ng-sfdisk util-linux-ng-mount util-linux-ng-readprofile "
@@ -152,7 +152,7 @@ do_install () { done install -d ${D}${sysconfdir}/default/ - echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall + echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall.${PN} rm ${D}${sbindir}/swapoff -f ln -sf ${base_sbindir}/swapon.${PN} ${D}${base_sbindir}/swapoff.${PN}
@@ -269,3 +269,10 @@ pkg_prerm_util-linux-ng-readprofile () { update-alternatives --remove readprofile readprofile.${PN} 100 } +pkg_postinst_util-linux-ng-mountall () { + update-alternatives --install ${sysconfdir}/default/mountall default_mountall mountall.${PN} 100 +} +pkg_prerm_util-linux-ng-mountall () { + update-alternatives --remove default_mountall mountall.${PN} +} +
Signature · 1 line
1.7.0
Re: [PATCH 2/2] util-linux-ng: use u-a for /etc/default/mountall (collision with busybox-mountall)
On (05/03/10 12:55), Martin Jansa wrote:
Quoted 54 lines
--- recipes/util-linux-ng/util-linux-ng.inc | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-)recipes/util-linux-ng/util-linux-ng.inc +10
-3@@ -7,7 +7,7 @@ inherit autotools DEFAULT_PREFERENCE = "-1" -INC_PR = "r9" +INC_PR = "r10" # allows for a release candidate RC ?= ""@@ -46,7 +46,7 @@ FILES_util-linux-ng-umount = "${base_bindir}/umount.${PN}" FILES_util-linux-ng-readprofile = "${base_sbindir}/readprofile.${PN}" PACKAGES =+ "${PN}-mountall" -FILES_${PN}-mountall = "${sysconfdir}/default/mountall" +FILES_${PN}-mountall = "${sysconfdir}/default/mountall.${PN}" RREPLACES_${PN}-mountall = "busybox-mountall" RRECOMMENDS_${PN} = "util-linux-ng-fdisk util-linux-ng-cfdisk util-linux-ng-sfdisk util-linux-ng-mount util-linux-ng-readprofile "@@ -152,7 +152,7 @@ do_install () { done install -d ${D}${sysconfdir}/default/ - echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall + echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall.${PN} rm ${D}${sbindir}/swapoff -f ln -sf ${base_sbindir}/swapon.${PN} ${D}${base_sbindir}/swapoff.${PN}@@ -269,3 +269,10 @@ pkg_prerm_util-linux-ng-readprofile () { update-alternatives --remove readprofile readprofile.${PN} 100 } +pkg_postinst_util-linux-ng-mountall () { + update-alternatives --install ${sysconfdir}/default/mountall default_mountall mountall.${PN} 100 +} +pkg_prerm_util-linux-ng-mountall () { + update-alternatives --remove default_mountall mountall.${PN} +} +Signature · 7 lines
1.7.0 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel