summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/distro_alias.inc1
-rw-r--r--meta/conf/distro/include/maintainers.inc1
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-self-hosted.bb1
-rw-r--r--meta/recipes-extended/mktemp/files/disable-strip.patch15
-rw-r--r--meta/recipes-extended/mktemp/files/fix-parallel-make.patch24
-rw-r--r--meta/recipes-extended/mktemp/mktemp_1.7.bb36
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb1
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb1
8 files changed, 0 insertions, 80 deletions
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc
index 536605d1d0..27533fbae4 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -244,7 +244,6 @@ DISTRO_PN_ALIAS_pn-mini-x-session = "OSPDT"
244DISTRO_PN_ALIAS_pn-mkelfimage = "Ubuntu=mkelfimage Fedora=mkelfimage" 244DISTRO_PN_ALIAS_pn-mkelfimage = "Ubuntu=mkelfimage Fedora=mkelfimage"
245DISTRO_PN_ALIAS_pn-mkfontdir = "Mandriva=mkfontdir Ubuntu=xfonts-utils Fedora=xorg-x11-font-utils" 245DISTRO_PN_ALIAS_pn-mkfontdir = "Mandriva=mkfontdir Ubuntu=xfonts-utils Fedora=xorg-x11-font-utils"
246DISTRO_PN_ALIAS_pn-mkfontscale = "Mandriva=mkfontscale Ubuntu=xfonts-utils Fedora=xorg-x11-font-utils" 246DISTRO_PN_ALIAS_pn-mkfontscale = "Mandriva=mkfontscale Ubuntu=xfonts-utils Fedora=xorg-x11-font-utils"
247DISTRO_PN_ALIAS_pn-mktemp = "Mandriva=mktemp Fedora=mktemp"
248DISTRO_PN_ALIAS_pn-mmc-utils = "OE-Core" 247DISTRO_PN_ALIAS_pn-mmc-utils = "OE-Core"
249DISTRO_PN_ALIAS_pn-modutils-initscripts = "OE-Core" 248DISTRO_PN_ALIAS_pn-modutils-initscripts = "OE-Core"
250DISTRO_PN_ALIAS_pn-mtd-utils = "Debian=mtd-utils Ubuntu=mtd-utils" 249DISTRO_PN_ALIAS_pn-mtd-utils = "Debian=mtd-utils Ubuntu=mtd-utils"
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 4eadb2bec0..4b0eeeaedd 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -494,7 +494,6 @@ RECIPE_MAINTAINER_pn-mkelfimage = "Alexander Kanavin <alex.kanavin@gmail.com>"
494RECIPE_MAINTAINER_pn-mkfontdir = "Armin Kuster <akuster808@gmail.com>" 494RECIPE_MAINTAINER_pn-mkfontdir = "Armin Kuster <akuster808@gmail.com>"
495RECIPE_MAINTAINER_pn-mkfontscale = "Armin Kuster <akuster808@gmail.com>" 495RECIPE_MAINTAINER_pn-mkfontscale = "Armin Kuster <akuster808@gmail.com>"
496RECIPE_MAINTAINER_pn-mklibs-native = "Robert Yang <liezhi.yang@windriver.com>" 496RECIPE_MAINTAINER_pn-mklibs-native = "Robert Yang <liezhi.yang@windriver.com>"
497RECIPE_MAINTAINER_pn-mktemp = "Robert Yang <liezhi.yang@windriver.com>"
498RECIPE_MAINTAINER_pn-mmc-utils = "Maxin B. John <maxin.john@intel.com>" 497RECIPE_MAINTAINER_pn-mmc-utils = "Maxin B. John <maxin.john@intel.com>"
499RECIPE_MAINTAINER_pn-mobile-broadband-provider-info = "Alexander Kanavin <alex.kanavin@gmail.com>" 498RECIPE_MAINTAINER_pn-mobile-broadband-provider-info = "Alexander Kanavin <alex.kanavin@gmail.com>"
500RECIPE_MAINTAINER_pn-modutils-initscripts = "Yi Zhao <yi.zhao@windriver.com>" 499RECIPE_MAINTAINER_pn-modutils-initscripts = "Yi Zhao <yi.zhao@windriver.com>"
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 28f06d9c5a..9a6721ce03 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -80,7 +80,6 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\
80 libstdc++-dev \ 80 libstdc++-dev \
81 libtool \ 81 libtool \
82 make \ 82 make \
83 mktemp \
84 perl-module-re \ 83 perl-module-re \
85 perl-module-text-wrap \ 84 perl-module-text-wrap \
86 pkgconfig \ 85 pkgconfig \
diff --git a/meta/recipes-extended/mktemp/files/disable-strip.patch b/meta/recipes-extended/mktemp/files/disable-strip.patch
deleted file mode 100644
index e06869e3ad..0000000000
--- a/meta/recipes-extended/mktemp/files/disable-strip.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3diff --git a/Makefile.in b/Makefile.in
4index 37b3cc9..f1026f3 100644
5--- a/Makefile.in
6+++ b/Makefile.in
7@@ -95,7 +95,7 @@ install-dirs:
8 $(DESTDIR)$(mandir)/man1
9
10 install-binaries: $(PROG)
11- $(INSTALL) -m 0555 -s $(PROG) $(DESTDIR)$(bindir)/$(PROG)
12+ $(INSTALL) -m 0555 $(PROG) $(DESTDIR)$(bindir)/$(PROG)
13
14 install-man:
15 $(INSTALL) -m 0444 $(srcdir)/mktemp.$(mantype) \
diff --git a/meta/recipes-extended/mktemp/files/fix-parallel-make.patch b/meta/recipes-extended/mktemp/files/fix-parallel-make.patch
deleted file mode 100644
index f3b6dcc34a..0000000000
--- a/meta/recipes-extended/mktemp/files/fix-parallel-make.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1This fixes the parallel make install failure
2
3Upstream-Status: Accepted
4http://www.gratisoft.us/bugzilla/show_bug.cgi?id=528
5
6Signed-off-by: Saul Wold <sgw@linux.intel.com>
7
8Index: mktemp-1.7/Makefile.in
9===================================================================
10--- mktemp-1.7.orig/Makefile.in
11+++ mktemp-1.7/Makefile.in
12@@ -94,10 +94,10 @@ install-dirs:
13 $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) \
14 $(DESTDIR)$(mandir)/man1
15
16-install-binaries: $(PROG)
17+install-binaries: install-dirs $(PROG)
18 $(INSTALL) -m 0555 $(PROG) $(DESTDIR)$(bindir)/$(PROG)
19
20-install-man:
21+install-man: install-dirs
22 $(INSTALL) -m 0444 $(srcdir)/mktemp.$(mantype) \
23 $(DESTDIR)$(mandir)/man1/mktemp.1
24
diff --git a/meta/recipes-extended/mktemp/mktemp_1.7.bb b/meta/recipes-extended/mktemp/mktemp_1.7.bb
deleted file mode 100644
index e8ae5c6b72..0000000000
--- a/meta/recipes-extended/mktemp/mktemp_1.7.bb
+++ /dev/null
@@ -1,36 +0,0 @@
1SUMMARY = "Enables safe temporary file creation from shell scripts"
2HOMEPAGE = "http://www.mktemp.org/"
3BUGTRACKER = "http://www.mktemp.org/bugs"
4SECTION = "console/utils"
5LICENSE = "ISC"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=430680f6322a1eb87199b5e01a82c0d4"
7
8PR = "r3"
9
10SRC_URI = "ftp://ftp.mktemp.org/pub/mktemp/${BPN}-${PV}.tar.gz \
11 file://disable-strip.patch \
12 file://fix-parallel-make.patch \
13 "
14
15SRC_URI[md5sum] = "787bbed9fa2ee8e7645733c0e8e65172"
16SRC_URI[sha256sum] = "8e94b9e1edf866b2609545da65b627996ac5d158fda071e492bddb2f4a482675"
17
18inherit autotools update-alternatives
19
20EXTRA_OECONF = "--with-libc"
21
22do_install_append () {
23 if [ "${base_bindir}" != "${bindir}" ] ; then
24 install -d ${D}${base_bindir}
25 mv ${D}${bindir}/mktemp ${D}${base_bindir}/mktemp
26 rmdir ${D}${bindir}
27 fi
28}
29
30ALTERNATIVE_${PN} = "mktemp"
31ALTERNATIVE_LINK_NAME[mktemp] = "${base_bindir}/mktemp"
32ALTERNATIVE_PRIORITY = "60"
33
34ALTERNATIVE_${PN}-doc = "mktemp.1"
35ALTERNATIVE_PRIORITY_${PN}-doc = "300"
36ALTERNATIVE_LINK_NAME[mktemp.1] = "${mandir}/man1/mktemp.1"
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
index 92881e9f32..22b3f6782f 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
@@ -86,7 +86,6 @@ RDEPENDS_packagegroup-core-full-cmdline-utils = "\
86 mc-fish \ 86 mc-fish \
87 mc-helpers \ 87 mc-helpers \
88 mc-helpers-perl \ 88 mc-helpers-perl \
89 mktemp \
90 ncurses \ 89 ncurses \
91 net-tools \ 90 net-tools \
92 popt \ 91 popt \
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index 53d100ce74..ef6347c712 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -158,7 +158,6 @@ RDEPENDS_packagegroup-core-lsb-core = "\
158 make \ 158 make \
159 man \ 159 man \
160 man-pages \ 160 man-pages \
161 mktemp \
162 msmtp \ 161 msmtp \
163 patch \ 162 patch \
164 procps \ 163 procps \