diff options
| author | Oyvind Repvik <nail@nslu2-linux.org> | 2006-01-21 23:04:33 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-21 23:04:33 +0000 |
| commit | b23d1cb9a50613922861d94f8ff24005656877c3 (patch) | |
| tree | f58a500abdb9e2e9a5b7f4a51719dc2686a3c70b /packages | |
| parent | cada7083905fae4fe220097a445d53cb6c984ce2 (diff) | |
util-linux: Upstream upgrade to 2.12r
Split off mount to separate package
Fix fdisk thumb compilation problem.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/util-linux/files/fdiskbsdlabel_thumb.diff | 12 | ||||
| -rw-r--r-- | packages/util-linux/util-linux.inc | 17 | ||||
| -rw-r--r-- | packages/util-linux/util-linux_2.12r.bb | 3 |
3 files changed, 27 insertions, 5 deletions
diff --git a/packages/util-linux/files/fdiskbsdlabel_thumb.diff b/packages/util-linux/files/fdiskbsdlabel_thumb.diff new file mode 100644 index 0000000000..e6f82b5b46 --- /dev/null +++ b/packages/util-linux/files/fdiskbsdlabel_thumb.diff @@ -0,0 +1,12 @@ +--- util-linux-2.12r/fdisk/fdiskbsdlabel.h.orig 2006-01-21 23:53:51.000000000 +0100 ++++ util-linux-2.12r/fdisk/fdiskbsdlabel.h 2006-01-21 23:54:35.000000000 +0100 +@@ -52,6 +52,9 @@ + #elif defined (__s390__) || defined (__s390x__) + #define BSD_LABELSECTOR 1 + #define BSD_LABELOFFSET 0 ++#elif defined (__thumb__) ++#define BSD_LABELSECTOR 1 ++#define BSD_LABELOFFSET 0 + #else + #error unknown architecture + #endif diff --git a/packages/util-linux/util-linux.inc b/packages/util-linux/util-linux.inc index 5bb9a47655..28e726bddc 100644 --- a/packages/util-linux/util-linux.inc +++ b/packages/util-linux/util-linux.inc @@ -10,16 +10,18 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/util-linux/util-linux-${PV}.tar. file://MCONFIG \ file://make_include \ file://swapargs.h \ + file://fdiskbsdlabel_thumb.diff;patch=1 \ file://defines.h" -PACKAGES_prepend = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-readprofile " +PACKAGES_prepend = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile " FILES_util-linux-fdisk = "/sbin/fdisk.${PN}" FILES_util-linux-cfdisk = "/sbin/cfdisk" FILES_util-linux-sfdisk = "/sbin/sfdisk" +FILES_util-linux-mount = "/bin/mount.${PN}" FILES_util-linux-readprofile = "/usr/sbin/readprofile" -RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-readprofile" +RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile " do_compile () { set -e @@ -43,7 +45,6 @@ do_install () { mv ${D}${base_bindir}/dmesg ${D}${base_bindir}/dmesg.${PN} mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN} mv ${D}${base_bindir}/more ${D}${base_bindir}/more.${PN} - mv ${D}${base_bindir}/mount ${D}${base_bindir}/mount.${PN} mv ${D}${base_bindir}/umount ${D}${base_bindir}/umount.${PN} mv ${D}${base_sbindir}/halt ${D}${base_sbindir}/halt.${PN} mv ${D}${base_sbindir}/hwclock ${D}${base_sbindir}/hwclock.${PN} @@ -62,6 +63,7 @@ do_install () { mv ${D}${bindir}/renice ${D}${bindir}/renice.${PN} mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN} + mv ${D}${base_bindir}/mount ${D}${base_bindir}/mount.${PN} mv ${D}${base_sbindir}/fdisk ${D}${base_sbindir}/fdisk.${PN} } @@ -69,7 +71,6 @@ pkg_postinst_${PN} () { update-alternatives --install ${base_bindir}/dmesg dmesg dmesg.${PN} 100 update-alternatives --install ${base_bindir}/kill kill kill.${PN} 100 update-alternatives --install ${base_bindir}/more more more.${PN} 100 - update-alternatives --install ${base_bindir}/mount mount mount.${PN} 100 update-alternatives --install ${base_bindir}/umount umount umount.${PN} 100 update-alternatives --install ${base_sbindir}/losetup losetup losetup.${PN} 100 update-alternatives --install ${base_sbindir}/mkswap mkswap mkswap.${PN} 100 @@ -96,7 +97,6 @@ pkg_prerm_${PN} () { update-alternatives --remove dmesg dmesg.${PN} update-alternatives --remove kill kill.${PN} update-alternatives --remove more more.${PN} - update-alternatives --remove mount mount.${PN} update-alternatives --remove umount umount.${PN} update-alternatives --remove halt halt.${PN} update-alternatives --remove hwclock hwclock.${PN} @@ -124,3 +124,10 @@ pkg_prerm_util-linux-fdisk () { update-alternatives --remove fdisk fdisk.${PN} } +pkg_postinst_util-linux-mount () { + update-alternatives --install ${base_bindir}/mount mount mount.${PN} 100 +} + +pkg_prerm_util-linux-mount () { + update-alternatives --remove mount mount.${PN} +}
\ No newline at end of file diff --git a/packages/util-linux/util-linux_2.12r.bb b/packages/util-linux/util-linux_2.12r.bb new file mode 100644 index 0000000000..9c28d316f8 --- /dev/null +++ b/packages/util-linux/util-linux_2.12r.bb @@ -0,0 +1,3 @@ +include util-linux.inc + +PR = "r4" |