summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-05-18 12:36:34 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-05-18 12:36:34 +0100
commite2eaac645e9dd364a5e8c23f803e552bc5019987 (patch)
treed014cb7dabf77f32c7b4ad5ce96c569cf660a9d4 /meta
parent02def140ff7ef4653306f72af165e2493a1f1592 (diff)
downloadpoky-e2eaac645e9dd364a5e8c23f803e552bc5019987.tar.gz
util-linux 2.12r -> util-linux-ng 2.15
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/util-linux/util-linux-native_2.15.bb (renamed from meta/packages/util-linux/util-linux-native_2.12r.bb)4
-rw-r--r--meta/packages/util-linux/util-linux.inc72
-rw-r--r--meta/packages/util-linux/util-linux_2.12r.bb7
-rw-r--r--meta/packages/util-linux/util-linux_2.15.bb7
4 files changed, 54 insertions, 36 deletions
diff --git a/meta/packages/util-linux/util-linux-native_2.12r.bb b/meta/packages/util-linux/util-linux-native_2.15.bb
index 27c053000d..7a931786db 100644
--- a/meta/packages/util-linux/util-linux-native_2.12r.bb
+++ b/meta/packages/util-linux/util-linux-native_2.15.bb
@@ -5,7 +5,7 @@ DEPENDS = "zlib-native ncurses-native"
5 5
6inherit autotools native 6inherit autotools native
7 7
8SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux/util-linux-${PV}.tar.bz2 \ 8SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v2.15/util-linux-ng-${PV}.tar.bz2 \
9 file://gcc34.patch;patch=1 \ 9 file://gcc34.patch;patch=1 \
10 file://MCONFIG \ 10 file://MCONFIG \
11 file://make_include \ 11 file://make_include \
@@ -13,7 +13,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux/util-linux-${PV}.tar.b
13 file://fdiskbsdlabel_thumb.diff;patch=1 \ 13 file://fdiskbsdlabel_thumb.diff;patch=1 \
14 file://defines.h" 14 file://defines.h"
15 15
16S="${WORKDIR}/util-linux-${PV}" 16S="${WORKDIR}/util-linux-ng-${PV}"
17 17
18EXTRA_OEMAKE="'OPT=${BUILD_CFLAGS}' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'LDFLAGS=${BUILD_LDFLAGS}' SBINDIR=${base_sbindir} USRSBINDIR=${base_sbindir} LOGDIR=${localstatedir}/log VARPATH=${localstatedir} LOCALEDIR=${datadir}/locale" 18EXTRA_OEMAKE="'OPT=${BUILD_CFLAGS}' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'LDFLAGS=${BUILD_LDFLAGS}' SBINDIR=${base_sbindir} USRSBINDIR=${base_sbindir} LOGDIR=${localstatedir}/log VARPATH=${localstatedir} LOCALEDIR=${datadir}/locale"
19 19
diff --git a/meta/packages/util-linux/util-linux.inc b/meta/packages/util-linux/util-linux.inc
index a5ff009669..75177c8f28 100644
--- a/meta/packages/util-linux/util-linux.inc
+++ b/meta/packages/util-linux/util-linux.inc
@@ -1,21 +1,27 @@
1DESCRIPTION = "Util-linux is a suite of essential utilities for any Linux system." 1DESCRIPTION = "Util-linux is a suite of essential utilities for any Linux system."
2SECTION = "base" 2SECTION = "base"
3LICENSE = "GPL" 3LICENSE = "GPL"
4DEPENDS = "zlib ncurses" 4DEPENDS = "udev zlib ncurses virtual/libintl"
5 5
6inherit autotools 6inherit autotools
7 7
8SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux/util-linux-${PV}.tar.bz2 \ 8SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v2.15/util-linux-ng-${PV}.tar.bz2 \
9 file://gcc34.patch;patch=1 \
10 file://MCONFIG \ 9 file://MCONFIG \
11 file://make_include \ 10 file://make_include \
12 file://swapargs.h \ 11 file://swapargs.h \
13 file://fdiskbsdlabel_thumb.diff;patch=1 \ 12 file://fdiskbsdlabel_thumb.diff;patch=1 \
14 file://umount.diff;patch=1 \ 13 file://umount.diff;patch=1 \
15 file://defines.h" 14 file://defines.h"
15# file://gcc34.patch;patch=1 \
16 16
17PACKAGES_prepend = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-swaponoff util-linux-losetup util-linux-umount util-linux-mount util-linux-readprofile " 17PACKAGES_prepend = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-swaponoff util-linux-losetup util-linux-umount util-linux-mount util-linux-readprofile "
18 18
19S = "${WORKDIR}/util-linux-ng-${PV}"
20
21EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \
22 --enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \
23 --disable-login-utils --enable-write --enable-arch --enable-mount --with-fsprobe=builtin"
24
19FILES_${PN}-doc += "/usr/share/misc/getopt/getopt-*.*" 25FILES_${PN}-doc += "/usr/share/misc/getopt/getopt-*.*"
20 26
21FILES_util-linux-fdisk = "/sbin/fdisk.${PN}" 27FILES_util-linux-fdisk = "/sbin/fdisk.${PN}"
@@ -72,17 +78,19 @@ do_install () {
72 'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \ 78 'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \
73 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install 79 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install
74 80
75 test -f ${D}${base_sbindir}/pivot_root && \ 81 install -d ${D}${base_bindir}
76 mv ${D}${base_sbindir}/pivot_root ${D}${base_sbindir}/pivot_root.${PN} 82 install -d ${D}${base_sbindir}
77 mv ${D}${base_bindir}/dmesg ${D}${base_bindir}/dmesg.${PN} 83 test -f ${D}${sbindir}/pivot_root && \
78 mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN} 84 mv ${D}${sbindir}/pivot_root ${D}${base_sbindir}/pivot_root.${PN}
79 mv ${D}${base_bindir}/more ${D}${base_bindir}/more.${PN} 85 mv ${D}${bindir}/dmesg ${D}${base_bindir}/dmesg.${PN}
80 mv ${D}${base_sbindir}/hwclock ${D}${base_sbindir}/hwclock.${PN} 86 mv ${D}${bindir}/kill ${D}${base_bindir}/kill.${PN}
81 mv ${D}${base_sbindir}/mkswap ${D}${base_sbindir}/mkswap.${PN} 87 mv ${D}${bindir}/more ${D}${base_bindir}/more.${PN}
82 mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN} 88 mv ${D}${sbindir}/hwclock ${D}${base_sbindir}/hwclock.${PN}
83 mv ${D}${base_sbindir}/sln ${D}${base_sbindir}/sln.${PN} 89 mv ${D}${sbindir}/mkswap ${D}${base_sbindir}/mkswap.${PN}
84 mv ${D}${base_sbindir}/mkfs.minix ${D}${base_sbindir}/mkfs.minix.${PN} 90 mv ${D}${sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN}
85 mv ${D}${base_sbindir}/fsck.minix ${D}${base_sbindir}/fsck.minix.${PN} 91# mv ${D}${sbindir}/sln ${D}${base_sbindir}/sln.${PN}
92 mv ${D}${sbindir}/mkfs.minix ${D}${base_sbindir}/mkfs.minix.${PN}
93 mv ${D}${sbindir}/fsck.minix ${D}${base_sbindir}/fsck.minix.${PN}
86 mv ${D}${bindir}/hexdump ${D}${bindir}/hexdump.${PN} 94 mv ${D}${bindir}/hexdump ${D}${bindir}/hexdump.${PN}
87 mv ${D}${bindir}/last ${D}${bindir}/last.${PN} 95 mv ${D}${bindir}/last ${D}${bindir}/last.${PN}
88 mv ${D}${bindir}/logger ${D}${bindir}/logger.${PN} 96 mv ${D}${bindir}/logger ${D}${bindir}/logger.${PN}
@@ -90,17 +98,27 @@ do_install () {
90 mv ${D}${bindir}/renice ${D}${bindir}/renice.${PN} 98 mv ${D}${bindir}/renice ${D}${bindir}/renice.${PN}
91 mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN} 99 mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN}
92 100
93 mv ${D}${base_sbindir}/losetup ${D}${base_sbindir}/losetup.${PN} 101 mv ${D}${sbindir}/losetup ${D}${base_sbindir}/losetup.${PN}
94 mv ${D}${base_sbindir}/swapon ${D}${base_sbindir}/swapon.${PN} 102 mv ${D}${sbindir}/swapon ${D}${base_sbindir}/swapon.${PN}
95 mv ${D}${base_bindir}/umount ${D}${base_bindir}/umount.${PN} 103 mv ${D}${bindir}/umount ${D}${base_bindir}/umount.${PN}
96 mv ${D}${base_bindir}/mount ${D}${base_bindir}/mount.${PN} 104 mv ${D}${bindir}/mount ${D}${base_bindir}/mount.${PN}
97 mv ${D}${base_sbindir}/fdisk ${D}${base_sbindir}/fdisk.${PN} 105 mv ${D}${sbindir}/fdisk ${D}${base_sbindir}/fdisk.${PN}
98 106
99 checklink swapon ${D}${base_sbindir}/swapoff ".${PN}" 107 mv ${D}${sbindir}/agetty ${D}${base_sbindir}/
100 checklink shutdown ${D}${base_sbindir}/reboot ".${PN}" 108 mv ${D}${sbindir}/blockdev ${D}${base_sbindir}/
101 checklink shutdown ${D}${base_sbindir}/halt ".${PN}" 109 mv ${D}${sbindir}/cfdisk ${D}${base_sbindir}/
102 checklink shutdown ${D}${base_sbindir}/fastboot "" 110 mv ${D}${sbindir}/ctrlaltdel ${D}${base_sbindir}/
103 checklink shutdown ${D}${base_sbindir}/fasthalt "" 111
112 mv ${D}${sbindir}/readprofile ${D}${sbindir}/readprofile.${PN}
113
114 install -d ${D}${sysconfdir}/default/
115 echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall
116
117 ln -sf ${sbindir}/swapon ${D}${sbindir}/swapoff.${PN}
118 ln -sf ${sbindir}/shutdown ${D}${sbindir}/reboot.${PN}
119 ln -sf ${sbindir}/shutdown ${D}${sbindir}/halt.${PN}
120 ln -sf ${sbindir}/shutdown ${D}${sbindir}/fastboot
121 ln -sf ${sbindir}/shutdown ${D}${sbindir}/fasthalt
104} 122}
105 123
106pkg_postinst_${PN} () { 124pkg_postinst_${PN} () {
@@ -110,7 +128,7 @@ pkg_postinst_${PN} () {
110 update-alternatives --install ${base_sbindir}/mkswap mkswap mkswap.${PN} 100 128 update-alternatives --install ${base_sbindir}/mkswap mkswap mkswap.${PN} 100
111 test -x ${base_sbindir}/pivot_root.${PN} && \ 129 test -x ${base_sbindir}/pivot_root.${PN} && \
112 update-alternatives --install ${base_sbindir}/pivot_root pivot_root pivot_root.${PN} 100 130 update-alternatives --install ${base_sbindir}/pivot_root pivot_root pivot_root.${PN} 100
113 update-alternatives --install ${base_sbindir}/sln sln sln.${PN} 100 131# update-alternatives --install ${base_sbindir}/sln sln sln.${PN} 100
114 update-alternatives --install ${base_sbindir}/mkfs.minix mkfs.minix mkfs.minix.${PN} 100 132 update-alternatives --install ${base_sbindir}/mkfs.minix mkfs.minix mkfs.minix.${PN} 100
115 update-alternatives --install ${base_sbindir}/fsck.minix fsck.minix fsck.minix.${PN} 100 133 update-alternatives --install ${base_sbindir}/fsck.minix fsck.minix fsck.minix.${PN} 100
116 update-alternatives --install ${bindir}/hexdump hexdump hexdump.${PN} 100 134 update-alternatives --install ${bindir}/hexdump hexdump hexdump.${PN} 100
@@ -139,7 +157,7 @@ pkg_prerm_${PN} () {
139 update-alternatives --remove mkswap mkswap.${PN} 157 update-alternatives --remove mkswap mkswap.${PN}
140 update-alternatives --remove reboot reboot.${PN} 158 update-alternatives --remove reboot reboot.${PN}
141 update-alternatives --remove shutdown shutdown.${PN} 159 update-alternatives --remove shutdown shutdown.${PN}
142 update-alternatives --remove sln sln.${PN} 160# update-alternatives --remove sln sln.${PN}
143 update-alternatives --remove mkfs.minix mkfs.minix.${PN} 161 update-alternatives --remove mkfs.minix mkfs.minix.${PN}
144 update-alternatives --remove fsck.minix fsck.minix.${PN} 162 update-alternatives --remove fsck.minix fsck.minix.${PN}
145 update-alternatives --remove hexdump hexdump.${PN} 163 update-alternatives --remove hexdump hexdump.${PN}
diff --git a/meta/packages/util-linux/util-linux_2.12r.bb b/meta/packages/util-linux/util-linux_2.12r.bb
deleted file mode 100644
index 334c7b243d..0000000000
--- a/meta/packages/util-linux/util-linux_2.12r.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require util-linux.inc
2
3SRC_URI += "file://util-linux_2.12r-12.diff.gz;patch=1"
4SRC_URI += "file://glibc-fix.patch;patch=1"
5SRC_URI += "file://debian-bug392236.patch;patch=1"
6
7PR = "r11"
diff --git a/meta/packages/util-linux/util-linux_2.15.bb b/meta/packages/util-linux/util-linux_2.15.bb
new file mode 100644
index 0000000000..3e0b3cf053
--- /dev/null
+++ b/meta/packages/util-linux/util-linux_2.15.bb
@@ -0,0 +1,7 @@
1require util-linux.inc
2
3SRC_URI += "file://util-linux_2.12r-12.diff.gz;patch=1"
4#SRC_URI += "file://glibc-fix.patch;patch=1"
5#SRC_URI += "file://debian-bug392236.patch;patch=1"
6
7PR = "r11"