summaryrefslogtreecommitdiffstats
path: root/meta-lsb/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:14:24 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:29:45 +0100
commit29d6678fd546377459ef75cf54abeef5b969b5cf (patch)
tree8edd65790e37a00d01c3f203f773fe4b5012db18 /meta-lsb/packages
parentda49de6885ee1bc424e70bc02f21f6ab920efb55 (diff)
downloadpoky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta-lsb/packages')
-rw-r--r--meta-lsb/packages/at/at-3.1.10.2/configure.patch22
-rw-r--r--meta-lsb/packages/at/at-3.1.12/configure.patch22
-rw-r--r--meta-lsb/packages/at/at.inc13
-rw-r--r--meta-lsb/packages/at/at_3.1.10.2.bb14
-rw-r--r--meta-lsb/packages/at/at_3.1.12.bb14
-rw-r--r--meta-lsb/packages/at/files/nonrootinstall.patch75
-rw-r--r--meta-lsb/packages/at/files/use-ldflags.patch21
-rw-r--r--meta-lsb/packages/bc/bc_1.06.bb18
-rw-r--r--meta-lsb/packages/byacc/byacc.inc14
-rw-r--r--meta-lsb/packages/byacc/byacc_20100610.bb6
-rw-r--r--meta-lsb/packages/cracklib/cracklib_2.8.16.bb12
-rw-r--r--meta-lsb/packages/cwautomacros/cwautomacros_20090610.bb15
-rw-r--r--meta-lsb/packages/ed/ed-1.4/ed-1.2-build.patch43
-rw-r--r--meta-lsb/packages/ed/ed_0.5.bb11
-rw-r--r--meta-lsb/packages/ed/ed_1.4.bb22
-rw-r--r--meta-lsb/packages/ethtool/ethtool_2.6.34.bb11
-rw-r--r--meta-lsb/packages/gamin/gamin/no-abstract-sockets.patch54
-rw-r--r--meta-lsb/packages/gamin/gamin_0.1.10.bb30
-rw-r--r--meta-lsb/packages/gawk/gawk_3.1.5.bb30
-rw-r--r--meta-lsb/packages/images/poky-image-basic.bb8
-rw-r--r--meta-lsb/packages/images/poky-image-lsb.bb9
-rw-r--r--meta-lsb/packages/iptables/iptables_1.4.8.bb31
-rw-r--r--meta-lsb/packages/iputils/files/debian/CVE-2010-2529.diff22
-rw-r--r--meta-lsb/packages/iputils/files/debian/add-icmp-return-codes.diff41
-rw-r--r--meta-lsb/packages/iputils/files/debian/fix-arping-timeouts.diff24
-rw-r--r--meta-lsb/packages/iputils/files/debian/fix-dead-host-ping-stats.diff14
-rw-r--r--meta-lsb/packages/iputils/files/debian/targets.diff13
-rw-r--r--meta-lsb/packages/iputils/files/debian/use_gethostbyname2.diff29
-rw-r--r--meta-lsb/packages/iputils/iputils_s20100418.bb78
-rw-r--r--meta-lsb/packages/libuser/libuser-0.56.16/disable-sgml-doc.patch18
-rw-r--r--meta-lsb/packages/libuser/libuser_0.56.16.bb20
-rw-r--r--meta-lsb/packages/minicom/minicom-2.3/gcc4-scope.patch44
-rw-r--r--meta-lsb/packages/minicom/minicom-2.3/rename-conflicting-functions.patch13
-rw-r--r--meta-lsb/packages/minicom/minicom_2.3.bb17
-rw-r--r--meta-lsb/packages/mktemp/files/disable-strip.patch13
-rw-r--r--meta-lsb/packages/mktemp/mktemp_1.7.bb26
-rw-r--r--meta-lsb/packages/net-tools/net-tools-1.60-23/net-tools-config.h75
-rw-r--r--meta-lsb/packages/net-tools/net-tools-1.60-23/net-tools-config.make36
-rw-r--r--meta-lsb/packages/net-tools/net-tools_1.60-23.bb77
-rw-r--r--meta-lsb/packages/pax/pax_3.4.bb16
-rw-r--r--meta-lsb/packages/perl/libconvert-asn1-perl_0.21.bb14
-rw-r--r--meta-lsb/packages/perl/libtimedate-perl_1.20.bb21
-rw-r--r--meta-lsb/packages/procps/procps-3.2.7/install.patch27
-rw-r--r--meta-lsb/packages/procps/procps-3.2.7/linux-limits.patch13
-rw-r--r--meta-lsb/packages/procps/procps-3.2.7/pagesz-not-constant.patch22
-rw-r--r--meta-lsb/packages/procps/procps-3.2.7/procmodule.patch36
-rw-r--r--meta-lsb/packages/procps/procps-3.2.7/procps.init6
-rw-r--r--meta-lsb/packages/procps/procps-3.2.7/psmodule.patch21
-rw-r--r--meta-lsb/packages/procps/procps-3.2.7/sysctl.conf64
-rw-r--r--meta-lsb/packages/procps/procps.inc16
-rw-r--r--meta-lsb/packages/procps/procps_3.2.7.bb64
-rw-r--r--meta-lsb/packages/qt-apps/fotowall_0.9.bb19
-rw-r--r--meta-lsb/packages/qt-apps/qmmp_0.4.1.bb32
-rw-r--r--meta-lsb/packages/qt-apps/quicky_0.4.bb16
-rw-r--r--meta-lsb/packages/qt4/files/0001-cross-compile.patch36
-rw-r--r--meta-lsb/packages/qt4/files/0002-fix-resinit-declaration.patch22
-rw-r--r--meta-lsb/packages/qt4/files/0004-no-qmake.patch26
-rw-r--r--meta-lsb/packages/qt4/files/0006-freetype-host-includes.patch24
-rw-r--r--meta-lsb/packages/qt4/files/0008-qt-lib-infix.patch36
-rw-r--r--meta-lsb/packages/qt4/files/0009-support-2bpp.patch299
-rw-r--r--meta-lsb/packages/qt4/files/0010-no-simpledecoration-example.patch14
-rw-r--r--meta-lsb/packages/qt4/files/fix-config-tests.patch36
-rw-r--r--meta-lsb/packages/qt4/files/g++.conf53
-rw-r--r--meta-lsb/packages/qt4/files/hack-out-pg_config.patch30
-rw-r--r--meta-lsb/packages/qt4/files/linux.conf54
-rw-r--r--meta-lsb/packages/qt4/files/qt-config.patch24
-rw-r--r--meta-lsb/packages/qt4/qt-4.6.3.inc65
-rw-r--r--meta-lsb/packages/qt4/qt4-tools-native.inc74
-rw-r--r--meta-lsb/packages/qt4/qt4-tools-native_4.6.3.bb11
-rw-r--r--meta-lsb/packages/qt4/qt4-x11-free-4.6.3/linux.conf54
-rw-r--r--meta-lsb/packages/qt4/qt4-x11-free.inc14
-rw-r--r--meta-lsb/packages/qt4/qt4-x11-free_4.6.3.bb6
-rw-r--r--meta-lsb/packages/qt4/qt4.inc300
-rw-r--r--meta-lsb/packages/quota/quota_3.17.bb19
-rw-r--r--meta-lsb/packages/shadow/shadow-4.1.4.2/login_defs_pam.sed32
-rw-r--r--meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/chfn14
-rw-r--r--meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/chpasswd4
-rw-r--r--meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/chsh19
-rw-r--r--meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/login91
-rw-r--r--meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/newusers4
-rw-r--r--meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/passwd5
-rw-r--r--meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/su60
-rw-r--r--meta-lsb/packages/shadow/shadow-4.1.4.2/securetty206
-rw-r--r--meta-lsb/packages/shadow/shadow-4.1.4.2/shadow-4.1.3-dots-in-usernames.patch23
-rw-r--r--meta-lsb/packages/shadow/shadow-4.1.4.2/shadow-4.1.4.2-env-reset-keep-locale.patch27
-rw-r--r--meta-lsb/packages/shadow/shadow-4.1.4.2/shadow-4.1.4.2-groupmod-pam-check.patch32
-rw-r--r--meta-lsb/packages/shadow/shadow-4.1.4.2/shadow-4.1.4.2-su_no_sanitize_env.patch27
-rw-r--r--meta-lsb/packages/shadow/shadow-4.1.4.2/shadow.automake-1.11.patch102
-rw-r--r--meta-lsb/packages/shadow/shadow.inc121
-rw-r--r--meta-lsb/packages/shadow/shadow_4.1.4.2.bb11
-rw-r--r--meta-lsb/packages/sysstat/files/99_sysstat1
-rw-r--r--meta-lsb/packages/sysstat/sysstat.inc33
-rw-r--r--meta-lsb/packages/sysstat/sysstat_9.1.4.bb7
-rw-r--r--meta-lsb/packages/tar/tar-1.17/gcc43build.patch35
-rw-r--r--meta-lsb/packages/tar/tar-1.17/m4extensions.patch28
-rw-r--r--meta-lsb/packages/tar/tar.inc25
-rw-r--r--meta-lsb/packages/tar/tar_1.17.bb13
-rw-r--r--meta-lsb/packages/tar/tar_1.23.bb9
-rw-r--r--meta-lsb/packages/tasks/task-poky-basic.bb156
-rw-r--r--meta-lsb/packages/tasks/task-poky-lsb.bb103
-rw-r--r--meta-lsb/packages/which/which-2.18/fix_name_conflict_group_member.patch51
-rw-r--r--meta-lsb/packages/which/which-2.20/remove-declaration.patch16
-rw-r--r--meta-lsb/packages/which/which_2.18.bb40
-rw-r--r--meta-lsb/packages/which/which_2.20.bb35
-rw-r--r--meta-lsb/packages/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch84
-rw-r--r--meta-lsb/packages/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch77
-rw-r--r--meta-lsb/packages/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch110
-rw-r--r--meta-lsb/packages/xinetd/xinetd/xinetd.conf11
-rw-r--r--meta-lsb/packages/xinetd/xinetd/xinetd.init57
-rw-r--r--meta-lsb/packages/xinetd/xinetd_2.3.14.bb45
-rw-r--r--meta-lsb/packages/xz/xz_4.999.9beta.bb20
111 files changed, 0 insertions, 4373 deletions
diff --git a/meta-lsb/packages/at/at-3.1.10.2/configure.patch b/meta-lsb/packages/at/at-3.1.10.2/configure.patch
deleted file mode 100644
index f6720111d6..0000000000
--- a/meta-lsb/packages/at/at-3.1.10.2/configure.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1# Fix cross-compilation issues in configure.ac
2# Derived from an OE patch for at-3.1.8
3
4--- at-3.1.10.2.orig/configure.in 2005-08-04 20:16:02.000000000 -0700
5+++ at-3.1.10.2/configure.in 2010-07-21 15:52:38.000000000 -0700
6@@ -37,12 +37,11 @@
7 AC_MSG_RESULT(no)
8 ;;
9 esac
10+if [ X"${cross_compiling}" = Xno ]; then
11 AC_MSG_CHECKING(Trying to compile a trivial ANSI C program)
12-AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],
13- AC_MSG_RESULT(yes),
14- AC_MSG_RESULT(no)
15- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.),
16- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.))
17+AC_RUN_IFELSE([AC_LANG_SOURCE([[ main(int ac, char **av) { return 0; } ]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
18+ AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)],[AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)])
19+fi
20
21 AC_MSG_CHECKING(__attribute__((noreturn)))
22 AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);],
diff --git a/meta-lsb/packages/at/at-3.1.12/configure.patch b/meta-lsb/packages/at/at-3.1.12/configure.patch
deleted file mode 100644
index 6ab528d0b2..0000000000
--- a/meta-lsb/packages/at/at-3.1.12/configure.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1# Fix cross-compilation issues in configure.ac
2# Derived from an OE patch for at-3.1.8
3
4--- at-3.1.12.orig/configure.ac 2009-11-23 07:11:52.000000000 -0800
5+++ at-3.1.12/configure.ac 2010-07-20 16:23:14.000000000 -0700
6@@ -38,12 +38,11 @@
7 AC_MSG_RESULT(no)
8 ;;
9 esac
10+if [ X"${cross_compiling}" = Xno ]; then
11 AC_MSG_CHECKING(Trying to compile a trivial ANSI C program)
12-AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],
13- AC_MSG_RESULT(yes),
14- AC_MSG_RESULT(no)
15- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.),
16- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.))
17+AC_RUN_IFELSE([AC_LANG_SOURCE([[ main(int ac, char **av) { return 0; } ]])], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)
18+ AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)], [AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)])
19+fi
20
21 AC_MSG_CHECKING(__attribute__((noreturn)))
22 AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);],
diff --git a/meta-lsb/packages/at/at.inc b/meta-lsb/packages/at/at.inc
deleted file mode 100644
index 2ced0c2a9f..0000000000
--- a/meta-lsb/packages/at/at.inc
+++ /dev/null
@@ -1,13 +0,0 @@
1DESCRIPTION = "Delayed job execution and batch processing"
2SECTION = "base"
3DEPENDS = "flex"
4RCONFLICTS_${PN} = "atd"
5RREPLACES_${PN} = "atd"
6
7inherit autotools
8
9export LIBS = "-L${STAGING_LIBDIR}"
10
11do_install () {
12 oe_runmake "IROOT=${D}" install
13}
diff --git a/meta-lsb/packages/at/at_3.1.10.2.bb b/meta-lsb/packages/at/at_3.1.10.2.bb
deleted file mode 100644
index ff4cf489b3..0000000000
--- a/meta-lsb/packages/at/at_3.1.10.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1require at.inc
2
3LICENSE="GPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4"
5
6PR = "r0"
7
8SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.tar.gz \
9 file://configure.patch \
10 file://nonrootinstall.patch \
11 file://use-ldflags.patch"
12
13SRC_URI[md5sum] = "485688690a0aae53224c4150867da334"
14SRC_URI[sha256sum] = "35c4ab4248ba5898ccaddc5efe8722a8f3639deeb07623fa2d41f740e337690f"
diff --git a/meta-lsb/packages/at/at_3.1.12.bb b/meta-lsb/packages/at/at_3.1.12.bb
deleted file mode 100644
index 141168dc9a..0000000000
--- a/meta-lsb/packages/at/at_3.1.12.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1require at.inc
2
3LICENSE="GPLv2+ & GPLv3+"
4LIC_FILES_CHKSUM = "file://Copyright;md5=dffa11c636884752fbf0b2a159b2883a"
5
6PR = "r0"
7
8SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
9 file://configure.patch \
10 file://nonrootinstall.patch \
11 file://use-ldflags.patch"
12
13SRC_URI[md5sum] = "1e67991776148fb319fd77a2e599a765"
14SRC_URI[sha256sum] = "7c55c6ab4fbe8add9e68f31b2b0ebf3fe805c9a4e7cfb2623a3d8a4789cc18f3"
diff --git a/meta-lsb/packages/at/files/nonrootinstall.patch b/meta-lsb/packages/at/files/nonrootinstall.patch
deleted file mode 100644
index f760e85ae8..0000000000
--- a/meta-lsb/packages/at/files/nonrootinstall.patch
+++ /dev/null
@@ -1,75 +0,0 @@
1# Modify install rules to disable file ownership changes
2# Disable stripping binaries
3# Derived from an OE patch for at-3.1.8
4
5--- at-3.1.10.2.orig/Makefile.in 2005-08-29 01:08:28.000000000 -0700
6+++ at-3.1.10.2/Makefile.in 2010-07-21 17:06:01.000000000 -0700
7@@ -40,6 +40,10 @@
8 LIBS = @LIBS@
9 LIBOBJS = @LIBOBJS@
10 INSTALL = @INSTALL@
11+ifeq ($(IROOT),)
12+INSTALLOWN = -g root -o root
13+DAEMONOWN = -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME)
14+endif
15 PAMLIB = @PAMLIB@
16
17 CLONES = atq atrm
18@@ -88,35 +92,38 @@
19 $(CC) -c $(CFLAGS) $(DEFS) $*.c
20
21 install: all
22- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(etcdir)
23- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(bindir)
24- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(sbindir)
25- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(docdir)
26- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(atdocdir)
27- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR)
28+ $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(etcdir)
29+ $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(bindir)
30+ $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(sbindir)
31+ $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(docdir)
32+ $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(atdocdir)
33+ $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(ATJOB_DIR)
34+ $(INSTALL) $(DAEMONOWN) -m 755 -d $(IROOT)$(ATSPOOL_DIR)
35 chmod 1770 $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR)
36 touch $(IROOT)$(LFILE)
37 chmod 600 $(IROOT)$(LFILE)
38+ifeq ($(IROOT),)
39 chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE)
40- test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(IROOT)$(etcdir)/
41- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(IROOT)$(bindir)
42+endif
43+ test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) $(INSTALLOWN) -m 600 at.deny $(IROOT)$(etcdir)/
44+ $(INSTALL) $(INSTALLOWN) -m 4755 at $(IROOT)$(bindir)
45 $(LN_S) -f at $(IROOT)$(bindir)/atq
46 $(LN_S) -f at $(IROOT)$(bindir)/atrm
47- $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir)
48- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir)
49- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir)
50- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir)
51- $(INSTALL) -g root -o root -m 755 -s atd $(IROOT)$(sbindir)
52- $(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir)
53- $(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/
54+ $(INSTALL) $(INSTALLOWN) -m 755 batch $(IROOT)$(bindir)
55+ $(INSTALL) -d $(INSTALLOWN) -m 755 $(IROOT)$(man1dir)
56+ $(INSTALL) -d $(INSTALLOWN) -m 755 $(IROOT)$(man5dir)
57+ $(INSTALL) -d $(INSTALLOWN) -m 755 $(IROOT)$(man8dir)
58+ $(INSTALL) $(INSTALLOWN) -m 755 atd $(IROOT)$(sbindir)
59+ $(INSTALL) $(INSTALLOWN) -m 755 atrun $(IROOT)$(sbindir)
60+ $(INSTALL) $(INSTALLOWN) -m 644 at.1 $(IROOT)$(man1dir)/
61 cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1
62- $(INSTALL) -g root -o root -m 644 atd.8 $(IROOT)$(man8dir)/
63+ $(INSTALL) $(INSTALLOWN) -m 644 atd.8 $(IROOT)$(man8dir)/
64 sed "s,\$${exec_prefix},$(exec_prefix),g" <atrun.8>tmpman
65- $(INSTALL) -g root -o root -m 644 tmpman $(IROOT)$(man8dir)/atrun.8
66+ $(INSTALL) $(INSTALLOWN) -m 644 tmpman $(IROOT)$(man8dir)/atrun.8
67 rm -f tmpman
68- $(INSTALL) -g root -o root -m 644 at_allow.5 $(IROOT)$(man5dir)/
69+ $(INSTALL) $(INSTALLOWN) -m 644 at_allow.5 $(IROOT)$(man5dir)/
70 cd $(IROOT)$(man5dir) && $(LN_S) -f at_allow.5 at_deny.5
71- $(INSTALL) -g root -o root -m 644 $(DOCS) $(IROOT)$(atdocdir)
72+ $(INSTALL) $(INSTALLOWN) -m 644 $(DOCS) $(IROOT)$(atdocdir)
73 rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \
74 $(IROOT)$(mandir)/cat1/atq.1*
75 rm -f $(IROOT)$(mandir)/cat1/atd.8*
diff --git a/meta-lsb/packages/at/files/use-ldflags.patch b/meta-lsb/packages/at/files/use-ldflags.patch
deleted file mode 100644
index 7d3d91a19a..0000000000
--- a/meta-lsb/packages/at/files/use-ldflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1# Ensure use of $LDFLAGS during build
2# Derived from an OE patch for at-3.1.8
3
4--- at-3.1.12.orig/Makefile.in 2009-11-23 07:11:52.000000000 -0800
5+++ at-3.1.12/Makefile.in 2010-07-20 16:28:04.000000000 -0700
6@@ -65,13 +65,13 @@
7 all: at atd atrun
8
9 at: $(ATOBJECTS)
10- $(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB)
11+ $(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB) $(LDFLAGS)
12 rm -f $(CLONES)
13 $(LN_S) -f at atq
14 $(LN_S) -f at atrm
15
16 atd: $(RUNOBJECTS)
17- $(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB)
18+ $(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(LDFLAGS)
19
20 y.tab.c y.tab.h: parsetime.y
21 $(YACC) -d parsetime.y
diff --git a/meta-lsb/packages/bc/bc_1.06.bb b/meta-lsb/packages/bc/bc_1.06.bb
deleted file mode 100644
index eaef5f3f33..0000000000
--- a/meta-lsb/packages/bc/bc_1.06.bb
+++ /dev/null
@@ -1,18 +0,0 @@
1DESCRIPTION = "An arbitrary precision calculator language."
2HOMEPAGE = "http://www.gnu.org/software/bc/bc.html"
3BUGTRACKER = ""
4
5LICENSE = "GPLv2+ & LGPLv2.1"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
8 file://bc/bcdefs.h;endline=31;md5=46dffdaf10a99728dd8ce358e45d46d8 \
9 file://dc/dc.h;endline=25;md5=2f9c558cdd80e31b4d904e48c2374328 \
10 file://lib/number.c;endline=31;md5=99434a0898abca7784acfd36b8191199"
11
12SECTION = "base"
13DEPENDS = "flex"
14PR = "r0"
15
16SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz"
17
18inherit autotools
diff --git a/meta-lsb/packages/byacc/byacc.inc b/meta-lsb/packages/byacc/byacc.inc
deleted file mode 100644
index c6a5e38f77..0000000000
--- a/meta-lsb/packages/byacc/byacc.inc
+++ /dev/null
@@ -1,14 +0,0 @@
1DESCRIPTION = "Berkeley Yacc"
2SECTION = "devel"
3LICENSE = "public domain"
4
5SRC_URI = "ftp://invisible-island.net/byacc/byacc-${PV}.tgz"
6EXTRA_OECONF += "--program-transform-name='s,^,b,'"
7
8BBCLASSEXTEND = "native"
9
10inherit autotools
11
12do_configure() {
13 oe_runconf
14}
diff --git a/meta-lsb/packages/byacc/byacc_20100610.bb b/meta-lsb/packages/byacc/byacc_20100610.bb
deleted file mode 100644
index 48d0e4e425..0000000000
--- a/meta-lsb/packages/byacc/byacc_20100610.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1PR = "r0"
2
3require byacc.inc
4
5SRC_URI[md5sum] = "b9715b9a2867c221176b597e8f73cbc9"
6SRC_URI[sha256sum] = "1364c7fe382de659e8b9841a1736b645345a460d2f4302303e80c02235a2a575"
diff --git a/meta-lsb/packages/cracklib/cracklib_2.8.16.bb b/meta-lsb/packages/cracklib/cracklib_2.8.16.bb
deleted file mode 100644
index 9789737f98..0000000000
--- a/meta-lsb/packages/cracklib/cracklib_2.8.16.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1DESCRIPTION = "A pro-active password checker library"
2HOMEPAGE = "http://sourceforge.net/projects/cracklib"
3
4LICENSE = "LGPLv2.1+"
5LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
6
7DEPENDS = ""
8PR ="r0"
9
10SRC_URI = "${SOURCEFORGE_MIRROR}/cracklib/cracklib-${PV}.tar.gz"
11
12inherit autotools gettext
diff --git a/meta-lsb/packages/cwautomacros/cwautomacros_20090610.bb b/meta-lsb/packages/cwautomacros/cwautomacros_20090610.bb
deleted file mode 100644
index 9c03eece53..0000000000
--- a/meta-lsb/packages/cwautomacros/cwautomacros_20090610.bb
+++ /dev/null
@@ -1,15 +0,0 @@
1DESCRIPTION = "cwautomacros"
2SECTION = "base"
3HOMEPAGE = "http://cwautomacros.berlios.de/"
4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a"
6
7SRC_URI = http://download.berlios.de/cwautomacros/cwautomacros-${PV}.tar.bz2
8
9PR = "r0"
10
11do_install() {
12 oe_runmake CWAUTOMACROSPREFIX=${D}${prefix} install
13}
14
15BBCLASSEXTEND = "native"
diff --git a/meta-lsb/packages/ed/ed-1.4/ed-1.2-build.patch b/meta-lsb/packages/ed/ed-1.4/ed-1.2-build.patch
deleted file mode 100644
index a65c433d57..0000000000
--- a/meta-lsb/packages/ed/ed-1.4/ed-1.2-build.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1http://lists.gnu.org/archive/html/bug-ed/2008-12/msg00001.html
2
32007-04-16 Mike Frysinger <vapier@gentoo.org>
4
5 * Do not set CC/CXX/CPPFLAGS/LDFLAGS to "" so that user can
6 override if they so choose.
7 * Only set CFLAGS/CXXFLAGS if user did not specify any.
8
9ed had already taken GPLv3 when this patch out, so it should be GPLv3.
10Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
11
12Index: ed-1.4/configure
13===================================================================
14--- ed-1.4.orig/configure 2009-07-10 19:54:33.000000000 +0800
15+++ ed-1.4/configure 2010-08-05 17:41:51.000000000 +0800
16@@ -26,12 +26,6 @@
17 mandir='$(datadir)/man'
18 sysconfdir='$(prefix)/etc'
19 program_prefix=
20-CC=
21-CXX=
22-CPPFLAGS=
23-CFLAGS='-Wall -W -O2'
24-CXXFLAGS='-Wall -W -O2'
25-LDFLAGS=
26
27 # Loop over all args
28 while [ x"$1" != x ] ; do
29@@ -111,6 +105,14 @@
30 esac
31 done
32
33+# Defaults if the user did not select any
34+if [ x"${CFLAGS+set}" != xset ] ; then
35+ CFLAGS='-Wall -W -O2'
36+fi
37+if [ x"${CXXFLAGS+set}" != xset ] ; then
38+ CXXFLAGS='-Wall -W -O2'
39+fi
40+
41 # Find the source files, if location was not specified.
42 srcdirtext=
43 if [ x"${srcdir}" = x ] ; then
diff --git a/meta-lsb/packages/ed/ed_0.5.bb b/meta-lsb/packages/ed/ed_0.5.bb
deleted file mode 100644
index e14bf0e5a4..0000000000
--- a/meta-lsb/packages/ed/ed_0.5.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1DESCRIPTION = "GNU ed is a line-oriented text editor"
2HOMEPAGE = "http://www.gnu.org/software/ed/"
3SECTION = "base"
4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=6ddd5335ef96fb858a138230af773710 \
6 file://main.c;beginline=1;endline=17;md5=36d4b85e5ae9028e918d1cc775c2475e"
7
8PR = "r0"
9SRC_URI = "http://download.savannah.gnu.org/releases-noredirect/ed/ed-${PV}.tar.bz2"
10
11inherit autotools
diff --git a/meta-lsb/packages/ed/ed_1.4.bb b/meta-lsb/packages/ed/ed_1.4.bb
deleted file mode 100644
index 0243769e90..0000000000
--- a/meta-lsb/packages/ed/ed_1.4.bb
+++ /dev/null
@@ -1,22 +0,0 @@
1DESCRIPTION = "a line-oriented text editor"
2HOMEPAGE = "http://www.gnu.org/software/ed/"
3BUGTRACKER = ""
4
5LICENSE = "GPLv3+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
7 file://ed.h;endline=20;md5=294d5da73d15cd444ca2260fa2538296 \
8 file://main.c;endline=24;md5=122be7f2751ae819c803441972c7f45b"
9
10SECTION = "base"
11PR = "r0"
12
13SRC_URI = "${GNU_MIRROR}/ed/ed-${PV}.tar.gz \
14 file://ed-1.2-build.patch"
15
16do_configure() {
17 ${S}/configure
18}
19
20do_install() {
21 oe_runmake 'DESTDIR=${D}' install
22}
diff --git a/meta-lsb/packages/ethtool/ethtool_2.6.34.bb b/meta-lsb/packages/ethtool/ethtool_2.6.34.bb
deleted file mode 100644
index 9658f630a1..0000000000
--- a/meta-lsb/packages/ethtool/ethtool_2.6.34.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1DESCRIPTION = "A small utility for examining and tuning the settings of your ethernet-based network interfaces."
2HOMEPAGE = "http://sourceforge.net/projects/gkernel/"
3SECTION = "console/network"
4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
6 file://ethtool.c;firstline=4;endline=16;md5=6db6b005b8390ea76cb85a2c7bda8e6b"
7PR = "r0"
8
9SRC_URI = "${SOURCEFORGE_MIRROR}/gkernel/ethtool-${PV}.tar.gz"
10
11inherit autotools
diff --git a/meta-lsb/packages/gamin/gamin/no-abstract-sockets.patch b/meta-lsb/packages/gamin/gamin/no-abstract-sockets.patch
deleted file mode 100644
index b8aacfb23c..0000000000
--- a/meta-lsb/packages/gamin/gamin/no-abstract-sockets.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1--- /tmp/configure.in 2007-04-30 13:08:49.000000000 +0200
2+++ gamin-0.1.8/configure.in 2007-04-30 13:10:53.285251000 +0200
3@@ -354,51 +354,6 @@
4 AC_DEFINE(HAVE_CMSGCRED,1,[Have cmsgcred structure])
5 fi
6
7-#### Abstract sockets
8-
9-AC_MSG_CHECKING(abstract socket namespace)
10-AC_LANG_PUSH(C)
11-AC_RUN_IFELSE([AC_LANG_PROGRAM(
12-[[
13-#include <sys/types.h>
14-#include <stdlib.h>
15-#include <string.h>
16-#include <stdio.h>
17-#include <sys/socket.h>
18-#include <sys/un.h>
19-#include <errno.h>
20-]],
21-[[
22- int listen_fd;
23- struct sockaddr_un addr;
24-
25- listen_fd = socket (PF_UNIX, SOCK_STREAM, 0);
26-
27- if (listen_fd < 0)
28- {
29- fprintf (stderr, "socket() failed: %s\n", strerror (errno));
30- exit (1);
31- }
32-
33- memset (&addr, '\0', sizeof (addr));
34- addr.sun_family = AF_UNIX;
35- strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test");
36- addr.sun_path[0] = '\0'; /* this is what makes it abstract */
37-
38- if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0)
39- {
40- fprintf (stderr, "Abstract socket namespace bind() failed: %s\n",
41- strerror (errno));
42- exit (1);
43- }
44- else
45- exit (0);
46-]])],
47- [have_abstract_sockets=yes],
48- [have_abstract_sockets=no])
49-AC_LANG_POP(C)
50-AC_MSG_RESULT($have_abstract_sockets)
51-
52 if test x$enable_abstract_sockets = xyes; then
53 if test x$have_abstract_sockets = xno; then
54 AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.])
diff --git a/meta-lsb/packages/gamin/gamin_0.1.10.bb b/meta-lsb/packages/gamin/gamin_0.1.10.bb
deleted file mode 100644
index 21f1da434c..0000000000
--- a/meta-lsb/packages/gamin/gamin_0.1.10.bb
+++ /dev/null
@@ -1,30 +0,0 @@
1DESCRIPTION = "Gamin is a file and directory monitoring system defined to \
2be a subset of the FAM (File Alteration Monitor) system."
3HOMEPAGE = "http://people.gnome.org/~veillard/gamin/"
4
5LICENSE = "LGPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=412a9be54757a155d0b997b52b519f62"
7
8DEPENDS = "glib-2.0"
9PROVIDES = "fam"
10PR = "r2"
11
12SRC_URI = "http://www.gnome.org/~veillard/gamin/sources/gamin-${PV}.tar.gz \
13 file://no-abstract-sockets.patch"
14
15inherit autotools pkgconfig
16
17EXTRA_OECONF = "--without-python"
18
19PACKAGES += "lib${PN} lib${PN}-dev lib${PN}-dbg"
20FILES_${PN} = "${libexecdir}"
21FILES_${PN}-dbg = "${libexecdir}/.debug"
22FILES_lib${PN} = "${libdir}/lib*.so.*"
23FILES_lib${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/lib*.la \
24 ${libdir}/lib*.a ${libdir}/lib*.so"
25FILES_lib${PN}-dbg = "${libdir}/.debug/"
26
27RDEPENDS_lib${PN} = "${PN}"
28
29LEAD_SONAME = "libgamin-1.so"
30
diff --git a/meta-lsb/packages/gawk/gawk_3.1.5.bb b/meta-lsb/packages/gawk/gawk_3.1.5.bb
deleted file mode 100644
index 4bfa23d2e9..0000000000
--- a/meta-lsb/packages/gawk/gawk_3.1.5.bb
+++ /dev/null
@@ -1,30 +0,0 @@
1DESCRIPTION = "A program that you can use to select particular records in a \
2file and perform operations upon them."
3HOMEPAGE = "www.gnu.org/software/gawk"
4BUGTRACKER = "bug-gawk@gnu.org"
5SECTION = "console/utils"
6
7# gawk <= 3.1.5: GPLv2
8# gawk >= 3.1.6: GPLv3
9LICENSE = "GPLv2"
10LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
11
12RDEPENDS_gawk += "gawk-common"
13RDEPENDS_pgawk += "gawk-common"
14PR = "r0"
15
16SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz"
17
18inherit autotools gettext update-alternatives
19
20PACKAGES += "gawk-common pgawk"
21
22FILES_${PN} = "${bindir}/gawk* ${bindir}/igawk"
23FILES_gawk-common += "${datadir}/awk/* ${libexecdir}/awk/*"
24FILES_pgawk = "${bindir}/pgawk*"
25FILES_${PN}-dbg += "${libexecdir}/awk/.debug"
26
27ALTERNATIVE_NAME = "awk"
28ALTERNATIVE_PATH = "gawk"
29ALTERNATIVE_LINK = "${bindir}/awk"
30ALTERNATIVE_PRIORITY = "100"
diff --git a/meta-lsb/packages/images/poky-image-basic.bb b/meta-lsb/packages/images/poky-image-basic.bb
deleted file mode 100644
index 537a6e4122..0000000000
--- a/meta-lsb/packages/images/poky-image-basic.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1IMAGE_FEATURES += "apps-console-core "
2
3IMAGE_INSTALL = "\
4 ${POKY_BASE_INSTALL} \
5 task-poky-basic \
6 "
7
8inherit poky-image
diff --git a/meta-lsb/packages/images/poky-image-lsb.bb b/meta-lsb/packages/images/poky-image-lsb.bb
deleted file mode 100644
index 8424d91bb4..0000000000
--- a/meta-lsb/packages/images/poky-image-lsb.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1IMAGE_FEATURES += "apps-console-core "
2
3IMAGE_INSTALL = "\
4 ${POKY_BASE_INSTALL} \
5 task-poky-basic \
6 task-poky-lsb \
7 "
8
9inherit poky-image
diff --git a/meta-lsb/packages/iptables/iptables_1.4.8.bb b/meta-lsb/packages/iptables/iptables_1.4.8.bb
deleted file mode 100644
index ad707d30bc..0000000000
--- a/meta-lsb/packages/iptables/iptables_1.4.8.bb
+++ /dev/null
@@ -1,31 +0,0 @@
1DESCRIPTION = "iptables is the userspace command line program used to configure the Linux 2.4.x and 2.6.x IPv4 packet filtering ruleset"
2HOMEPAGE = "http://www.netfilter.org/"
3BUGTRACKER = "http://bugzilla.netfilter.org/"
4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
6 file://iptables.c;firstline=13;endline=25;md5=f1028f2401da1c120df27594b2be50ef"
7
8PR = "r0"
9
10RRECOMMENDS_${PN} = "kernel-module-x-tables \
11 kernel-module-ip-tables \
12 kernel-module-iptable-filter \
13 kernel-module-iptable-nat \
14 kernel-module-nf-defrag-ipv4 \
15 kernel-module-nf-conntrack \
16 kernel-module-nf-conntrack-ipv4 \
17 kernel-module-nf-nat \
18 kernel-module-ipt-masquerade"
19FILES_${PN}-dbg =+ "${libexecdir}/xtables/.debug"
20
21SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2"
22
23inherit autotools
24
25EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \
26 ${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6', d)}"
27
28do_configure_prepend() {
29 # they are all libtool m4 files
30 rm -rf ${S}/m4
31}
diff --git a/meta-lsb/packages/iputils/files/debian/CVE-2010-2529.diff b/meta-lsb/packages/iputils/files/debian/CVE-2010-2529.diff
deleted file mode 100644
index 98aae0d457..0000000000
--- a/meta-lsb/packages/iputils/files/debian/CVE-2010-2529.diff
+++ /dev/null
@@ -1,22 +0,0 @@
1Index: trunk/ping.c
2===================================================================
3--- trunk.orig/ping.c 2010-07-23 21:26:53.000000000 -0700
4+++ trunk/ping.c 2010-07-23 21:28:27.000000000 -0700
5@@ -1059,7 +1059,7 @@
6 i = j;
7 i -= IPOPT_MINOFF;
8 if (i <= 0)
9- continue;
10+ break;
11 if (i == old_rrlen
12 && !strncmp((char *)cp, old_rr, i)
13 && !(options & F_FLOOD)) {
14@@ -1096,7 +1096,7 @@
15 i = j;
16 i -= 5;
17 if (i <= 0)
18- continue;
19+ break;
20 flags = *++cp;
21 printf("\nTS: ");
22 cp++;
diff --git a/meta-lsb/packages/iputils/files/debian/add-icmp-return-codes.diff b/meta-lsb/packages/iputils/files/debian/add-icmp-return-codes.diff
deleted file mode 100644
index 86bbf0d39a..0000000000
--- a/meta-lsb/packages/iputils/files/debian/add-icmp-return-codes.diff
+++ /dev/null
@@ -1,41 +0,0 @@
1Index: trunk/ping.c
2===================================================================
3--- trunk.orig/ping.c 2010-05-07 23:13:54.000000000 -0700
4+++ trunk/ping.c 2010-05-07 23:23:22.000000000 -0700
5@@ -883,9 +883,36 @@
6 case ICMP_SR_FAILED:
7 printf("Source Route Failed\n");
8 break;
9+ case ICMP_NET_UNKNOWN:
10+ printf("Destination Net Unknown\n");
11+ break;
12+ case ICMP_HOST_UNKNOWN:
13+ printf("Destination Host Unknown\n");
14+ break;
15+ case ICMP_HOST_ISOLATED:
16+ printf("Source Host Isolated\n");
17+ break;
18+ case ICMP_NET_ANO:
19+ printf("Destination Net Prohibited\n");
20+ break;
21+ case ICMP_HOST_ANO:
22+ printf("Destination Host Prohibited\n");
23+ break;
24+ case ICMP_NET_UNR_TOS:
25+ printf("Destination Net Unreachable for Type of Service\n");
26+ break;
27+ case ICMP_HOST_UNR_TOS:
28+ printf("Destination Host Unreachable for Type of Service\n");
29+ break;
30 case ICMP_PKT_FILTERED:
31 printf("Packet filtered\n");
32 break;
33+ case ICMP_PREC_VIOLATION:
34+ printf("Precedence Violation\n");
35+ break;
36+ case ICMP_PREC_CUTOFF:
37+ printf("Precedence Cutoff\n");
38+ break;
39 default:
40 printf("Dest Unreachable, Bad Code: %d\n", code);
41 break;
diff --git a/meta-lsb/packages/iputils/files/debian/fix-arping-timeouts.diff b/meta-lsb/packages/iputils/files/debian/fix-arping-timeouts.diff
deleted file mode 100644
index 9f05769f71..0000000000
--- a/meta-lsb/packages/iputils/files/debian/fix-arping-timeouts.diff
+++ /dev/null
@@ -1,24 +0,0 @@
1Index: trunk/arping.c
2===================================================================
3--- trunk.orig/arping.c 2010-05-07 23:13:52.000000000 -0700
4+++ trunk/arping.c 2010-05-07 23:41:16.000000000 -0700
5@@ -182,12 +182,17 @@
6 if (start.tv_sec==0)
7 start = tv;
8
9- if (count-- == 0 || (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500))
10+ if (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500)
11 finish();
12
13- if (last.tv_sec==0 || MS_TDIFF(tv,last) > 500) {
14+ if ((!timeout) && (count == 0))
15+ finish();
16+
17+ if ( count!=0 && (last.tv_sec==0 || MS_TDIFF(tv,last) > 500 ) ) {
18 send_pack(s, src, dst,
19 (struct sockaddr_ll *)&me, (struct sockaddr_ll *)&he);
20+ if (count >= 0)
21+ count--;
22 if (count == 0 && unsolicited)
23 finish();
24 }
diff --git a/meta-lsb/packages/iputils/files/debian/fix-dead-host-ping-stats.diff b/meta-lsb/packages/iputils/files/debian/fix-dead-host-ping-stats.diff
deleted file mode 100644
index 2a924258da..0000000000
--- a/meta-lsb/packages/iputils/files/debian/fix-dead-host-ping-stats.diff
+++ /dev/null
@@ -1,14 +0,0 @@
1Index: trunk/ping_common.c
2===================================================================
3--- trunk.orig/ping_common.c 2010-05-07 23:13:51.000000000 -0700
4+++ trunk/ping_common.c 2010-05-07 23:22:33.000000000 -0700
5@@ -872,7 +872,8 @@
6 printf("%spipe %d", comma, pipesize);
7 comma = ", ";
8 }
9- if (ntransmitted > 1 && (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) {
10+ if (ntransmitted > 1 && nreceived &&
11+ (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) {
12 int ipg = (1000000*(long long)tv.tv_sec+tv.tv_usec)/(ntransmitted-1);
13 printf("%sipg/ewma %d.%03d/%d.%03d ms",
14 comma, ipg/1000, ipg%1000, rtt/8000, (rtt/8)%1000);
diff --git a/meta-lsb/packages/iputils/files/debian/targets.diff b/meta-lsb/packages/iputils/files/debian/targets.diff
deleted file mode 100644
index b5e907a8d0..0000000000
--- a/meta-lsb/packages/iputils/files/debian/targets.diff
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: trunk/Makefile
2===================================================================
3--- trunk.orig/Makefile 2010-05-07 23:43:00.000000000 -0700
4+++ trunk/Makefile 2010-05-07 23:47:10.000000000 -0700
5@@ -16,7 +16,7 @@
6 CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
7 CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES)
8
9-IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
10+IPV4_TARGETS=tracepath ping arping clockdiff
11 IPV6_TARGETS=tracepath6 traceroute6 ping6
12 TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
13
diff --git a/meta-lsb/packages/iputils/files/debian/use_gethostbyname2.diff b/meta-lsb/packages/iputils/files/debian/use_gethostbyname2.diff
deleted file mode 100644
index 7e6c97c14a..0000000000
--- a/meta-lsb/packages/iputils/files/debian/use_gethostbyname2.diff
+++ /dev/null
@@ -1,29 +0,0 @@
1Index: trunk/tracepath.c
2===================================================================
3--- trunk.orig/tracepath.c 2010-05-07 23:13:52.000000000 -0700
4+++ trunk/tracepath.c 2010-05-07 23:24:09.000000000 -0700
5@@ -338,9 +338,9 @@
6 base_port = atoi(p+1);
7 } else
8 base_port = 44444;
9- he = gethostbyname(argv[0]);
10+ he = gethostbyname2(argv[0], AF_INET);
11 if (he == NULL) {
12- herror("gethostbyname");
13+ herror("gethostbyname2");
14 exit(1);
15 }
16 memcpy(&target.sin_addr, he->h_addr, 4);
17Index: trunk/ping.c
18===================================================================
19--- trunk.orig/ping.c 2010-05-07 23:23:22.000000000 -0700
20+++ trunk/ping.c 2010-05-07 23:24:09.000000000 -0700
21@@ -250,7 +250,7 @@
22 if (argc == 1)
23 options |= F_NUMERIC;
24 } else {
25- hp = gethostbyname(target);
26+ hp = gethostbyname2(target, AF_INET);
27 if (!hp) {
28 fprintf(stderr, "ping: unknown host %s\n", target);
29 exit(2);
diff --git a/meta-lsb/packages/iputils/iputils_s20100418.bb b/meta-lsb/packages/iputils/iputils_s20100418.bb
deleted file mode 100644
index 3f793eca57..0000000000
--- a/meta-lsb/packages/iputils/iputils_s20100418.bb
+++ /dev/null
@@ -1,78 +0,0 @@
1DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \
2tracepath, tracepath6, ping, ping6 and arping."
3HOMEPAGE = "http://www.skbuff.net/iputils"
4SECTION = "console/network"
5
6LICENSE = "BSD & GPLv2+"
7
8DEPENDS = "sysfsutils openssl"
9
10PR = "r0"
11
12SRC_URI = "http://www.skbuff.net/iputils/${PN}-${PV}.tar.bz2 \
13 file://debian/fix-dead-host-ping-stats.diff \
14 file://debian/add-icmp-return-codes.diff \
15 file://debian/use_gethostbyname2.diff \
16 file://debian/targets.diff \
17 file://debian/fix-arping-timeouts.diff \
18 file://debian/CVE-2010-2529.diff \
19 "
20
21# man is not compiled here, since it requires docbook-utils-native
22# which is not available in poky
23
24do_compile () {
25 oe_runmake 'CC=${CC} -D_GNU_SOURCE' VPATH="${STAGING_LIBDIR}" all
26}
27
28do_install () {
29 install -m 0755 -d ${D}${base_bindir} ${D}${mandir}/man8
30 # SUID root programs
31 install -m 4555 ping ${D}${base_bindir}/ping.${PN}
32 install -m 4555 ping6 ${D}${base_bindir}/ping6.${PN}
33 install -m 4555 traceroute6 ${D}${base_bindir}/
34 # Other programgs
35 for i in arping tracepath tracepath6; do
36 install -m 0755 $i ${D}${base_bindir}/
37 done
38 # Manual pages for things we build packages for
39# for i in tracepath.8 traceroute6.8 ping.8 arping.8; do
40# install -m 0644 doc/$i ${D}${mandir}/man8/ || true
41# done
42}
43
44# Busybox also provides ping and ping6, so use update-alternatives
45# Also fixup SUID bit for applications that need it
46pkg_postinst_${PN}-ping () {
47 chmod 4555 ${base_bindir}/ping.${PN}
48 update-alternatives --install ${base_bindir}/ping ping ping.${PN} 100
49}
50pkg_prerm_${PN}-ping () {
51 update-alternatives --remove ping ping.${PN}
52}
53
54pkg_postinst_${PN}-ping6 () {
55 chmod 4555 ${base_bindir}/ping6.${PN}
56 update-alternatives --install ${base_bindir}/ping6 ping6 ping6.${PN} 100
57}
58pkg_prerm_${PN}-ping6 () {
59 update-alternatives --remove ping6 ping6.${PN}
60}
61
62pkg_postinst_${PN}-traceroute6 () {
63 chmod 4555 ${base_bindir}/traceroute6
64}
65
66PACKAGES += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6"
67
68ALLOW_EMPTY_${PN} = "1"
69RDEPENDS_${PN} += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6"
70
71FILES_${PN} = ""
72FILES_${PN}-ping = "${base_bindir}/ping.${PN}"
73FILES_${PN}-ping6 = "${base_bindir}/ping6.${PN}"
74FILES_${PN}-arping = "${base_bindir}/arping"
75FILES_${PN}-tracepath = "${base_bindir}/tracepath"
76FILES_${PN}-tracepath6 = "${base_bindir}/tracepath6"
77FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6"
78FILES_${PN}-doc = "${mandir}/man8"
diff --git a/meta-lsb/packages/libuser/libuser-0.56.16/disable-sgml-doc.patch b/meta-lsb/packages/libuser/libuser-0.56.16/disable-sgml-doc.patch
deleted file mode 100644
index a2017c5724..0000000000
--- a/meta-lsb/packages/libuser/libuser-0.56.16/disable-sgml-doc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Disable generating docs from sgml, which requries linuxdoc-tools.
2
3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
4Index: libuser-0.56.16/docs/Makefile.am
5===================================================================
6--- libuser-0.56.16.orig/docs/Makefile.am 2010-08-12 13:29:43.000000000 +0800
7+++ libuser-0.56.16/docs/Makefile.am 2010-08-12 13:29:51.000000000 +0800
8@@ -14,8 +14,8 @@
9
10 sgml/libuser.txt: $(srcdir)/sgml/libuser.sgml
11 [ -d sgml ] || mkdir sgml
12- cd sgml; sgml2txt ../$(srcdir)/sgml/libuser.sgml
13+# cd sgml; sgml2txt ../$(srcdir)/sgml/libuser.sgml
14
15 sgml/libuser.html: $(srcdir)/sgml/libuser.sgml
16 [ -d sgml ] || mkdir sgml
17- cd sgml; sgml2html ../$(srcdir)/sgml/libuser.sgml
18+# cd sgml; sgml2html ../$(srcdir)/sgml/libuser.sgml
diff --git a/meta-lsb/packages/libuser/libuser_0.56.16.bb b/meta-lsb/packages/libuser/libuser_0.56.16.bb
deleted file mode 100644
index d72430ec0f..0000000000
--- a/meta-lsb/packages/libuser/libuser_0.56.16.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1DESCRIPTION = "The libuser library implements a standardized interface for manipulating and administering user and group accounts"
2HOMEPAGE = "https://fedorahosted.org/libuser/"
3BUGTRACKER = "https://fedorahosted.org/libuser/newticket"
4
5LICENSE = "LGPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
7 file://lib/user.h;endline=19;md5=9bc141f2e0d3e8b97ecdc945b2ed1ec7 \
8 file://samples/testuser.c;endline=19;md5=61e8c05bd37ce1cba5590071f6e17500"
9
10SECTION = "base"
11
12SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz \
13 file://disable-sgml-doc.patch;patch=1"
14PR = "r0"
15
16DEPENDS = "gettext libpam glib-2.0 xz-native"
17
18EXTRA_OECONF += "--disable-gtk-doc --without-python"
19
20inherit autotools
diff --git a/meta-lsb/packages/minicom/minicom-2.3/gcc4-scope.patch b/meta-lsb/packages/minicom/minicom-2.3/gcc4-scope.patch
deleted file mode 100644
index 5bd47bd354..0000000000
--- a/meta-lsb/packages/minicom/minicom-2.3/gcc4-scope.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1--- minicom-2.1/src/window.c.orig 2006-06-14 17:49:53.000000000 +0200
2+++ minicom-2.1/src/window.c 2006-06-14 17:50:14.000000000 +0200
3@@ -62,7 +62,7 @@
4 static char *CS, *SF, *SR, *VB, *BL;
5 static char *VE, *VI, *KS, *KE;
6 static char *CD, *CL, *IC, *DC;
7-static char *BC, *CR, *NL;
8+static char *mcBC, *CR, *NL;
9 #if ST_LINE
10 static char *TS, *FS, *DS;
11 #endif
12@@ -322,8 +322,8 @@
13 else if (NL != CNULL && x == 0 && x == curx && y == cury + 1)
14 outstr(NL);
15 #endif
16- else if (BC != CNULL && y == cury && x == curx - 1)
17- outstr(BC);
18+ else if (mcBC != CNULL && y == cury && x == curx - 1)
19+ outstr(mcBC);
20 else
21 outstr(tgoto(CM, x, y));
22 curx = x;
23@@ -1918,7 +1918,7 @@
24 CL = tgetstr("cl", &_tptr);
25 IC = tgetstr("ic", &_tptr);
26 DC = tgetstr("dc", &_tptr);
27- BC = tgetstr("bc", &_tptr);
28+ mcBC = tgetstr("bc", &_tptr);
29 CR = tgetstr("cr", &_tptr);
30 NL = tgetstr("nl", &_tptr);
31 AC = tgetstr("ac", &_tptr);
32@@ -1967,10 +1967,10 @@
33 _has_am = tgetflag("am");
34 _mv_standout = tgetflag("ms");
35 if (tgetflag("bs")) {
36- if (BC == CNULL) BC = "\b";
37+ if (mcBC == CNULL) mcBC = "\b";
38 }
39 else
40- BC = CNULL;
41+ mcBC = CNULL;
42
43 /* Special IBM box-drawing characters */
44 D_UL = 201;
diff --git a/meta-lsb/packages/minicom/minicom-2.3/rename-conflicting-functions.patch b/meta-lsb/packages/minicom/minicom-2.3/rename-conflicting-functions.patch
deleted file mode 100644
index c344203267..0000000000
--- a/meta-lsb/packages/minicom/minicom-2.3/rename-conflicting-functions.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1--- minicom-2.3/src/minicom.c-orig 2009-06-08 14:49:07.000000000 +0200
2+++ minicom-2.3/src/minicom.c 2009-06-08 14:50:23.000000000 +0200
3@@ -63,6 +63,10 @@
4 }
5 #endif /*DEBUG*/
6
7+#ifdef __USE_GNU
8+#define getline minicom_getline
9+#endif
10+
11 /*
12 * Sub - menu's.
13 */
diff --git a/meta-lsb/packages/minicom/minicom_2.3.bb b/meta-lsb/packages/minicom/minicom_2.3.bb
deleted file mode 100644
index a114e30c99..0000000000
--- a/meta-lsb/packages/minicom/minicom_2.3.bb
+++ /dev/null
@@ -1,17 +0,0 @@
1SECTION = "console/network"
2DEPENDS = "ncurses"
3LICENSE = "GPL"
4SRC_URI = "http://alioth.debian.org/frs/download.php/2332/minicom-${PV}.tar.gz \
5 file://rename-conflicting-functions.patch \
6 "
7
8# file://gcc4-scope.patch;patch=1 \
9
10inherit autotools gettext
11
12do_install() {
13 for d in doc extras man lib src; do make -C $d DESTDIR=${D} install; done
14}
15
16SRC_URI[md5sum] = "0ebe7a91898384ca906787cc4e2c3f25"
17SRC_URI[sha256sum] = "2acbc3d4a07e1134ee285a72fa44bbc27703b02dba02be68db9e6fd8320356fb"
diff --git a/meta-lsb/packages/mktemp/files/disable-strip.patch b/meta-lsb/packages/mktemp/files/disable-strip.patch
deleted file mode 100644
index d6bc528a21..0000000000
--- a/meta-lsb/packages/mktemp/files/disable-strip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1diff --git a/Makefile.in b/Makefile.in
2index 37b3cc9..f1026f3 100644
3--- a/Makefile.in
4+++ b/Makefile.in
5@@ -95,7 +95,7 @@ install-dirs:
6 $(DESTDIR)$(mandir)/man1
7
8 install-binaries: $(PROG)
9- $(INSTALL) -m 0555 -s $(PROG) $(DESTDIR)$(bindir)/$(PROG)
10+ $(INSTALL) -m 0555 $(PROG) $(DESTDIR)$(bindir)/$(PROG)
11
12 install-man:
13 $(INSTALL) -m 0444 $(srcdir)/mktemp.$(mantype) \
diff --git a/meta-lsb/packages/mktemp/mktemp_1.7.bb b/meta-lsb/packages/mktemp/mktemp_1.7.bb
deleted file mode 100644
index a34827450c..0000000000
--- a/meta-lsb/packages/mktemp/mktemp_1.7.bb
+++ /dev/null
@@ -1,26 +0,0 @@
1DESCRIPTION = "Allow safe temporary file creation from shell scripts."
2HOMEPAGE = "http://www.mktemp.org/"
3BUGTRACKER = "http://www.mktemp.org/bugs"
4SECTION = "console/utils"
5LICENSE = "ISC style"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=430680f6322a1eb87199b5e01a82c0d4"
7
8PR = "r0"
9
10SRC_URI = "ftp://ftp.mktemp.org/pub/mktemp/${P}.tar.gz \
11 file://disable-strip.patch \
12 "
13
14inherit autotools update-alternatives
15
16EXTRA_OECONF = "--with-libc"
17
18do_install_append () {
19 mkdir ${D}${base_bindir}
20 mv ${D}${bindir}/mktemp ${D}${base_bindir}/mktemp.${PN}
21}
22
23ALTERNATIVE_NAME = "mktemp"
24ALTERNATIVE_LINK = "${base_bindir}/mktemp"
25ALTERNATIVE_PATH = "${base_bindir}/mktemp.${PN}"
26ALTERNATIVE_PRIORITY = "100"
diff --git a/meta-lsb/packages/net-tools/net-tools-1.60-23/net-tools-config.h b/meta-lsb/packages/net-tools/net-tools-1.60-23/net-tools-config.h
deleted file mode 100644
index 92c527a51e..0000000000
--- a/meta-lsb/packages/net-tools/net-tools-1.60-23/net-tools-config.h
+++ /dev/null
@@ -1,75 +0,0 @@
1/*
2* config.h Automatically generated configuration includefile
3*
4* NET-TOOLS A collection of programs that form the base set of the
5* NET-3 Networking Distribution for the LINUX operating
6* system.
7*
8* DO NOT EDIT DIRECTLY
9*
10*/
11
12/*
13 *
14 * Internationalization
15 *
16 * The net-tools package has currently been translated to French,
17 * German and Brazilian Portugese. Other translations are, of
18 * course, welcome. Answer `n' here if you have no support for
19 * internationalization on your system.
20 *
21 */
22#define I18N 1
23
24/*
25 *
26 * Protocol Families.
27 *
28 */
29#define HAVE_AFUNIX 1
30#define HAVE_AFINET 1
31#define HAVE_AFINET6 1
32#define HAVE_AFIPX 0
33#define HAVE_AFATALK 0
34#define HAVE_AFAX25 0
35#define HAVE_AFNETROM 1
36#define HAVE_AFROSE 0
37#define HAVE_AFX25 0
38#define HAVE_AFECONET 0
39#define HAVE_AFDECnet 0
40#define HAVE_AFASH 0
41
42/*
43 *
44 * Device Hardware types.
45 *
46 */
47#define HAVE_HWETHER 1
48#define HAVE_HWARC 1
49#define HAVE_HWSLIP 1
50#define HAVE_HWPPP 1
51#define HAVE_HWTUNNEL 1
52#define HAVE_HWSTRIP 1
53#define HAVE_HWTR 1
54#define HAVE_HWAX25 0
55#define HAVE_HWROSE 0
56#define HAVE_HWNETROM 1
57#define HAVE_HWX25 0
58#define HAVE_HWFR 1
59#define HAVE_HWSIT 0
60#define HAVE_HWFDDI 0
61#define HAVE_HWHIPPI 0
62#define HAVE_HWASH 0
63#define HAVE_HWHDLCLAPB 0
64#define HAVE_HWIRDA 1
65#define HAVE_HWEC 0
66#define HAVE_HWIB 0
67
68/*
69 *
70 * Other Features.
71 *
72 */
73#define HAVE_FW_MASQUERADE 1
74#define HAVE_IP_TOOLS 1
75#define HAVE_MII 1
diff --git a/meta-lsb/packages/net-tools/net-tools-1.60-23/net-tools-config.make b/meta-lsb/packages/net-tools/net-tools-1.60-23/net-tools-config.make
deleted file mode 100644
index ec516f27ee..0000000000
--- a/meta-lsb/packages/net-tools/net-tools-1.60-23/net-tools-config.make
+++ /dev/null
@@ -1,36 +0,0 @@
1I18N=1
2HAVE_AFUNIX=1
3HAVE_AFINET=1
4HAVE_AFINET6=1
5# HAVE_AFIPX=0
6# HAVE_AFATALK=0
7# HAVE_AFAX25=0
8HAVE_AFNETROM=1
9# HAVE_AFROSE=0
10# HAVE_AFX25=0
11# HAVE_AFECONET=0
12# HAVE_AFDECnet=0
13# HAVE_AFASH=0
14HAVE_HWETHER=1
15HAVE_HWARC=1
16HAVE_HWSLIP=1
17HAVE_HWPPP=1
18HAVE_HWTUNNEL=1
19HAVE_HWSTRIP=1
20HAVE_HWTR=1
21# HAVE_HWAX25=0
22# HAVE_HWROSE=0
23HAVE_HWNETROM=1
24# HAVE_HWX25=0
25HAVE_HWFR=1
26# HAVE_HWSIT=0
27# HAVE_HWFDDI=0
28# HAVE_HWHIPPI=0
29# HAVE_HWASH=0
30# HAVE_HWHDLCLAPB=0
31HAVE_HWIRDA=1
32# HAVE_HWEC=0
33# HAVE_HWIB=0
34HAVE_FW_MASQUERADE=1
35HAVE_IP_TOOLS=1
36HAVE_MII=1
diff --git a/meta-lsb/packages/net-tools/net-tools_1.60-23.bb b/meta-lsb/packages/net-tools/net-tools_1.60-23.bb
deleted file mode 100644
index 031169c067..0000000000
--- a/meta-lsb/packages/net-tools/net-tools_1.60-23.bb
+++ /dev/null
@@ -1,77 +0,0 @@
1SUMMARY="A collection of programs that form the base set of the NET-3 networking distribution for the Linux operating system"
2HOMEPAGE = "http://net-tools.berlios.de/"
3BUGTRACKER = "http://bugs.debian.org/net-tools"
4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
6 file://ifconfig.c;startline=11;endline=15;md5=da4c7bb79a5d0798faa99ef869721f4a"
7PR = "r0"
8
9SRC_URI = "ftp://ftp.debian.org/debian/pool/main/n/net-tools/net-tools_1.60.orig.tar.gz \
10 ftp://ftp.debian.org/debian/pool/main/n/net-tools/${PN}_${PV}.diff.gz;apply=no \
11 file://net-tools-config.h \
12 file://net-tools-config.make"
13
14S = "${WORKDIR}/net-tools-1.60"
15
16inherit gettext
17
18# The Makefile is lame, no parallel build
19PARALLEL_MAKE = ""
20
21# Unlike other Debian packages, net-tools *.diff.gz contains another series of
22# patches maintained by quilt. So manually apply them before applying other local
23# patches. Also remove all temp files before leaving, because do_patch() will pop
24# up all previously applied patches in the start
25nettools_do_patch() {
26 cd ${S}
27 patch -p1 < ${WORKDIR}/${PN}_${PV}.diff
28 QUILT_PATCHES=${S}/debian/patches quilt push -a
29 rm -rf ${S}/patches ${S}/.pc
30}
31
32# We invoke base do_patch at end, to incorporate any local patch
33python do_patch() {
34 bb.build.exec_func('nettools_do_patch', d)
35 bb.build.exec_func('patch_do_patch', d)
36}
37
38do_configure() {
39 # net-tools has its own config mechanism requiring "make config"
40 # we pre-generate desired options and copy to source directory instead
41 cp ${WORKDIR}/net-tools-config.h ${S}/config.h
42 cp ${WORKDIR}/net-tools-config.make ${S}/config.make
43}
44
45do_compile() {
46 # net-tools use COPTS/LOPTS to allow adding custom options
47 export COPTS="$CFLAGS"
48 export LOPTS="$LDFLAGS"
49 unset CFLAGS
50 unset LDFLAGS
51
52 oe_runmake
53}
54
55do_install() {
56 oe_runmake 'BASEDIR=${D}' install
57
58 for app in ${D}/${base_sbindir}/* ${D}/${base_bindir}/*; do
59 mv $app $app.${PN}
60 done
61}
62
63pkg_postinst_${PN} () {
64 for app in arp ifconfig ipmaddr iptunnel mii-tool nameif plipconfig rarp route slattach ; do
65 update-alternatives --install ${base_sbindir}/$app $app $app.${PN} 100
66 done
67
68 for app in dnsdomainname domainname hostname netstat nisdomainname ypdomainname ; do
69 update-alternatives --install ${base_bindir}/$app $app $app.${PN} 100
70 done
71}
72
73pkg_prerm_${PN} () {
74 for app in arp ifconfig ipmaddr iptunnel mii-tool nameif plipconfig rarp route slattach dnsdomainname domainname hostname netstat nisdomainname ypdomainname ; do
75 update-alternatives --remove $app $app.${PN}
76 done
77}
diff --git a/meta-lsb/packages/pax/pax_3.4.bb b/meta-lsb/packages/pax/pax_3.4.bb
deleted file mode 100644
index 32804ba0c1..0000000000
--- a/meta-lsb/packages/pax/pax_3.4.bb
+++ /dev/null
@@ -1,16 +0,0 @@
1DESCRIPTION = "pax (Portable Archive eXchange) is the POSIX standard archive tool"
2HOMEPAGE = "http://www.openbsd.org/cgi-bin/cvsweb/src/bin/pax/"
3BUGTRACKER = "http://www.openbsd.org/query-pr.html"
4
5LICENSE = "BSD"
6LIC_FILES_CHKSUM = "file://COPYING;md5=4b0b674dfdc56daa3832d4069b820ea0 \
7 file://src/pax.h;endline=40;md5=309d3e241c1d82069228e5a51e9b8d60 \
8 file://src/cpio.h;endline=40;md5=c3b4bbff6133a83387968617bbae8ac4 \
9 file://lib/vis.h;endline=40;md5=b283f759abd4a5ad7e014b80f51fc053"
10
11SECTION = "base"
12PR = "r0"
13
14SRC_URI = "ftp://ftp.suse.com/pub/people/kukuk/pax/pax-${PV}.tar.bz2"
15
16inherit autotools
diff --git a/meta-lsb/packages/perl/libconvert-asn1-perl_0.21.bb b/meta-lsb/packages/perl/libconvert-asn1-perl_0.21.bb
deleted file mode 100644
index 3292ee338f..0000000000
--- a/meta-lsb/packages/perl/libconvert-asn1-perl_0.21.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1DESCRIPTION = "Convert::ASN1 - ASN.1 Encode/Decode library"
2SECTION = "libs"
3LICENSE = "Artistic|GPL"
4PR = "r0"
5
6SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/Convert-ASN1-${PV}.tar.gz"
7
8S = "${WORKDIR}/Convert-ASN1-${PV}"
9
10inherit cpan
11
12BBCLASSEXTEND="native"
13
14PACKAGE_ARCH = "all"
diff --git a/meta-lsb/packages/perl/libtimedate-perl_1.20.bb b/meta-lsb/packages/perl/libtimedate-perl_1.20.bb
deleted file mode 100644
index 84406adfb0..0000000000
--- a/meta-lsb/packages/perl/libtimedate-perl_1.20.bb
+++ /dev/null
@@ -1,21 +0,0 @@
1DESCRIPTION = "TimeDate - parser for absolute times"
2SECTION = "libs"
3# You can redistribute it and/or modify it under the same terms as Perl itself.
4LICENSE = "Artistic|GPL"
5PR = "r2"
6
7
8SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/TimeDate-${PV}.tar.gz"
9
10S = "${WORKDIR}/TimeDate-${PV}"
11
12inherit cpan
13
14BBCLASSEXTEND="native"
15
16RDEPENDS_${PN}_virtclass-native = ""
17RDEPENDS_${PN} += "perl-module-carp perl-module-exporter perl-module-strict perl-module-time-local"
18PACKAGE_ARCH = "all"
19
20SRC_URI[md5sum] = "7da7452bce4c684e4238e6d09b390200"
21SRC_URI[sha256sum] = "f8251a791f6692c69952b4af697c01df93981ad1ab133279d034656a03cd3755"
diff --git a/meta-lsb/packages/procps/procps-3.2.7/install.patch b/meta-lsb/packages/procps/procps-3.2.7/install.patch
deleted file mode 100644
index 9f1ef6915d..0000000000
--- a/meta-lsb/packages/procps/procps-3.2.7/install.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1--- procps-3.2.5.virgin/Makefile 2005-01-26 05:55:26.000000000 +0100
2+++ procps-3.2.5/Makefile 2005-08-03 04:55:26.346984488 +0200
3@@ -30,7 +30,10 @@
4 install := install -D --owner 0 --group 0
5
6 # Lame x86-64 /lib64 and /usr/lib64 abomination:
7-lib64 := lib$(shell [ -d /lib64 ] && echo 64)
8+# lib64 := lib$(shell [ -d /lib64 ] && echo 64)
9+
10+# Equally lame hack to work around makefile lameness when the host arch is 64bit, but the target is not.
11+lib64 := lib
12
13 usr/bin := $(DESTDIR)/usr/bin/
14 bin := $(DESTDIR)/bin/
15@@ -211,10 +214,10 @@
16 ###### install
17
18 $(BINFILES) : all
19- $(install) --mode a=rx $(notdir $@) $@
20+ $(install) -m 555 $(notdir $@) $@
21
22 $(MANFILES) : all
23- $(install) --mode a=r $(notdir $@) $@
24+ $(install) -m 444 $(notdir $@) $@
25
26 install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL))
27 cd $(usr/bin) && $(ln_f) skill snice
diff --git a/meta-lsb/packages/procps/procps-3.2.7/linux-limits.patch b/meta-lsb/packages/procps/procps-3.2.7/linux-limits.patch
deleted file mode 100644
index dcd66163ad..0000000000
--- a/meta-lsb/packages/procps/procps-3.2.7/linux-limits.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1diff --git a/pwdx.c b/pwdx.c
2index cb96a52..29ebce2 100644
3--- a/pwdx.c
4+++ b/pwdx.c
5@@ -13,7 +13,7 @@
6 #include <stdlib.h>
7 #include <sys/types.h>
8 #include <regex.h>
9-#include <limits.h>
10+#include <linux/limits.h>
11 #include <unistd.h>
12 #include <errno.h>
13
diff --git a/meta-lsb/packages/procps/procps-3.2.7/pagesz-not-constant.patch b/meta-lsb/packages/procps/procps-3.2.7/pagesz-not-constant.patch
deleted file mode 100644
index 8e9e1ebfe1..0000000000
--- a/meta-lsb/packages/procps/procps-3.2.7/pagesz-not-constant.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Index: procps-3.2.1/proc/devname.c
2===================================================================
3--- procps-3.2.1.orig/proc/devname.c 2004-03-18 05:43:50.000000000 +1100
4+++ procps-3.2.1/proc/devname.c 2005-04-02 10:40:17.462138000 +1000
5@@ -227,7 +227,7 @@
6
7 /* number --> name */
8 unsigned dev_to_tty(char *restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags) {
9- static char buf[PAGE_SIZE];
10+ static char buf[4096];
11 char *restrict tmp = buf;
12 unsigned dev = dev_t_dev;
13 unsigned i = 0;
14@@ -249,7 +249,7 @@
15 if((flags&ABBREV_TTY) && !strncmp(tmp,"tty", 3) && tmp[3]) tmp += 3;
16 if((flags&ABBREV_PTS) && !strncmp(tmp,"pts/", 4) && tmp[4]) tmp += 4;
17 /* gotta check before we chop or we may chop someone else's memory */
18- if(chop + (unsigned long)(tmp-buf) <= sizeof buf)
19+ if(chop + (unsigned long)(tmp-buf) < sizeof buf)
20 tmp[chop] = '\0';
21 /* replace non-ASCII characters with '?' and return the number of chars */
22 for(;;){
diff --git a/meta-lsb/packages/procps/procps-3.2.7/procmodule.patch b/meta-lsb/packages/procps/procps-3.2.7/procmodule.patch
deleted file mode 100644
index fabfabaa59..0000000000
--- a/meta-lsb/packages/procps/procps-3.2.7/procmodule.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1*** procps-3.2.5/proc/module.mk.orig Sun Jul 24 11:53:49 2005
2--- procps-3.2.5/proc/module.mk Sun Jul 24 11:54:32 2005
3***************
4*** 96,102 ****
5 #################### install rules ###########################
6
7 $(lib)$(SOFILE) : proc/$(SONAME)
8! $(install) --mode a=rx $< $@
9
10 ifneq ($(SOLINK),$(SOFILE))
11 .PHONY: $(lib)$(SOLINK)
12--- 96,102 ----
13 #################### install rules ###########################
14
15 $(lib)$(SOFILE) : proc/$(SONAME)
16! $(install) -m 555 $< $@
17
18 ifneq ($(SOLINK),$(SOFILE))
19 .PHONY: $(lib)$(SOLINK)
20***************
21*** 115,121 ****
22 $(ldconfig)
23
24 $(usr/lib)$(ANAME) : proc/$(ANAME)
25! $(install) --mode a=r $< $@
26
27 # Junk anyway... supposed to go in /usr/include/$(NAME)
28 #INSTALL += $(addprefix $(include),$(HDRFILES))
29--- 115,121 ----
30 $(ldconfig)
31
32 $(usr/lib)$(ANAME) : proc/$(ANAME)
33! $(install) -m 444 $< $@
34
35 # Junk anyway... supposed to go in /usr/include/$(NAME)
36 #INSTALL += $(addprefix $(include),$(HDRFILES))
diff --git a/meta-lsb/packages/procps/procps-3.2.7/procps.init b/meta-lsb/packages/procps/procps-3.2.7/procps.init
deleted file mode 100644
index 739dcf4be7..0000000000
--- a/meta-lsb/packages/procps/procps-3.2.7/procps.init
+++ /dev/null
@@ -1,6 +0,0 @@
1#!/bin/sh
2
3SYSCTL_CONF="/etc/sysctl.conf"
4if [ -f "${SYSCTL_CONF}" ]; then
5 /sbin/sysctl -q -p "${SYSCTL_CONF}"
6fi
diff --git a/meta-lsb/packages/procps/procps-3.2.7/psmodule.patch b/meta-lsb/packages/procps/procps-3.2.7/psmodule.patch
deleted file mode 100644
index f298c1c1c4..0000000000
--- a/meta-lsb/packages/procps/procps-3.2.7/psmodule.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1*** procps-3.2.5/ps/module.mk.orig Sun Jul 24 11:54:40 2005
2--- procps-3.2.5/ps/module.mk Sun Jul 24 11:55:02 2005
3***************
4*** 33,40 ****
5
6
7 $(bin)ps: ps/ps
8! $(install) --mode a=rx $< $@
9
10 $(man1)ps.1 : ps/ps.1
11! $(install) --mode a=r $< $@
12 -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz
13--- 33,40 ----
14
15
16 $(bin)ps: ps/ps
17! $(install) -m 555 $< $@
18
19 $(man1)ps.1 : ps/ps.1
20! $(install) -m 444 $< $@
21 -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz
diff --git a/meta-lsb/packages/procps/procps-3.2.7/sysctl.conf b/meta-lsb/packages/procps/procps-3.2.7/sysctl.conf
deleted file mode 100644
index 34e7488bf7..0000000000
--- a/meta-lsb/packages/procps/procps-3.2.7/sysctl.conf
+++ /dev/null
@@ -1,64 +0,0 @@
1# This configuration file is taken from Debian.
2#
3# /etc/sysctl.conf - Configuration file for setting system variables
4# See sysctl.conf (5) for information.
5#
6
7#kernel.domainname = example.com
8
9# Uncomment the following to stop low-level messages on console
10#kernel.printk = 4 4 1 7
11
12##############################################################3
13# Functions previously found in netbase
14#
15
16# Uncomment the next two lines to enable Spoof protection (reverse-path filter)
17# Turn on Source Address Verification in all interfaces to
18# prevent some spoofing attacks
19net.ipv4.conf.default.rp_filter=1
20net.ipv4.conf.all.rp_filter=1
21
22# Uncomment the next line to enable TCP/IP SYN cookies
23#net.ipv4.tcp_syncookies=1
24
25# Uncomment the next line to enable packet forwarding for IPv4
26#net.ipv4.ip_forward=1
27
28# Uncomment the next line to enable packet forwarding for IPv6
29#net.ipv6.conf.all.forwarding=1
30
31
32###################################################################
33# Additional settings - these settings can improve the network
34# security of the host and prevent against some network attacks
35# including spoofing attacks and man in the middle attacks through
36# redirection. Some network environments, however, require that these
37# settings are disabled so review and enable them as needed.
38#
39# Ignore ICMP broadcasts
40#net.ipv4.icmp_echo_ignore_broadcasts = 1
41#
42# Ignore bogus ICMP errors
43#net.ipv4.icmp_ignore_bogus_error_responses = 1
44#
45# Do not accept ICMP redirects (prevent MITM attacks)
46#net.ipv4.conf.all.accept_redirects = 0
47#net.ipv6.conf.all.accept_redirects = 0
48# _or_
49# Accept ICMP redirects only for gateways listed in our default
50# gateway list (enabled by default)
51# net.ipv4.conf.all.secure_redirects = 1
52#
53# Do not send ICMP redirects (we are not a router)
54#net.ipv4.conf.all.send_redirects = 0
55#
56# Do not accept IP source route packets (we are not a router)
57#net.ipv4.conf.all.accept_source_route = 0
58#net.ipv6.conf.all.accept_source_route = 0
59#
60# Log Martian Packets
61#net.ipv4.conf.all.log_martians = 1
62#
63
64#kernel.shmmax = 141762560
diff --git a/meta-lsb/packages/procps/procps.inc b/meta-lsb/packages/procps/procps.inc
deleted file mode 100644
index 2de32d2c83..0000000000
--- a/meta-lsb/packages/procps/procps.inc
+++ /dev/null
@@ -1,16 +0,0 @@
1DESCRIPTION = "Procps is the package that has a bunch \
2of small useful utilities that give information \
3about processes using the /proc filesystem. The package \
4includes the programs ps, top, vmstat, w, kill, and skill."
5HOMEPAGE = "http://procps.sf.net"
6SECTION = "base"
7PRIORITY = "optional"
8LICENSE = "GPL"
9DEPENDS = "ncurses"
10
11FILES_${PN} += "${base_libdir}/libproc-*.so"
12
13SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
14 file://install.patch;patch=1"
15
16inherit autotools
diff --git a/meta-lsb/packages/procps/procps_3.2.7.bb b/meta-lsb/packages/procps/procps_3.2.7.bb
deleted file mode 100644
index 6da975adc7..0000000000
--- a/meta-lsb/packages/procps/procps_3.2.7.bb
+++ /dev/null
@@ -1,64 +0,0 @@
1require procps.inc
2
3PR = "r8"
4
5inherit update-rc.d
6
7INITSCRIPT_NAME = "procps.sh"
8INITSCRIPT_PARAMS = "start 30 S ."
9
10SRC_URI += "file://procmodule.patch;patch=1 \
11 file://psmodule.patch;patch=1 \
12 file://linux-limits.patch;patch=1 \
13 file://sysctl.conf \
14 file://procps.init \
15 "
16
17FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \
18 ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \
19 ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \
20 ${base_sbindir}/sysctl.${PN}"
21
22CONFFILES_${PN} = "${sysconfdir}/sysctl.conf"
23
24EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \
25 CPPFLAGS=-I${STAGING_INCDIR} \
26 LDFLAGS="${LDFLAGS}" \
27 CURSES=-lncurses \
28 install='install -D' \
29 ldconfig=echo"
30
31do_install_append () {
32 install -d ${D}${sysconfdir}
33 install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf
34 install -d ${D}${sysconfdir}/init.d
35 install -m 0755 ${WORKDIR}/procps.init ${D}${sysconfdir}/init.d/procps.sh
36
37 mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN}
38 mv ${D}${bindir}/top ${D}${bindir}/top.${PN}
39 mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN}
40 mv ${D}${base_bindir}/ps ${D}${base_bindir}/ps.${PN}
41 mv ${D}${bindir}/free ${D}${bindir}/free.${PN}
42 mv ${D}${base_sbindir}/sysctl ${D}${base_sbindir}/sysctl.${PN}
43 mv ${D}${bindir}/pkill ${D}${bindir}/pkill.${PN}
44}
45
46pkg_postinst() {
47 update-alternatives --install ${bindir}/top top top.${PN} 90
48 update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 90
49 update-alternatives --install ${base_bindir}/ps ps ps.${PN} 90
50 update-alternatives --install ${base_bindir}/kill kill kill.${PN} 90
51 update-alternatives --install ${bindir}/free free free.${PN} 90
52 update-alternatives --install ${base_sbindir}/sysctl sysctl sysctl.${PN} 90
53 update-alternatives --install ${bindir}/pkill pkill pkill.${PN} 90
54}
55
56pkg_postrm() {
57 update-alternatives --remove top top.${PN}
58 update-alternatives --remove ps ps.${PN}
59 update-alternatives --remove uptime uptime.${PN}
60 update-alternatives --remove kill kill.${PN}
61 update-alternatives --remove free free.${PN}
62 update-alternatives --remove sysctl sysctl.${PN}
63 update-alternatives --remove pkill pkill.${PN}
64}
diff --git a/meta-lsb/packages/qt-apps/fotowall_0.9.bb b/meta-lsb/packages/qt-apps/fotowall_0.9.bb
deleted file mode 100644
index 4070ac5548..0000000000
--- a/meta-lsb/packages/qt-apps/fotowall_0.9.bb
+++ /dev/null
@@ -1,19 +0,0 @@
1DESCRIPTION = "Fotowall is a creative tool that allows you to layout your photos or pictures \
2in a personal way. You can add pictures, then resize, move, change colors, text, shadows, etc.."
3
4HOMEPAGE = "http://www.enricoros.com/opensource/fotowall"
5LICENSE = "GPLv2+"
6SECTION = "x11/apps"
7
8DEPENDS = "qt4-x11-free"
9RDEPENDS = "qt4-x11-free"
10
11SRC_URI = "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2"
12
13S = "${WORKDIR}/Fotowall-${PV}"
14
15inherit qmake2 pkgconfig
16
17do_install() {
18 oe_runmake INSTALL_ROOT=${D} install
19}
diff --git a/meta-lsb/packages/qt-apps/qmmp_0.4.1.bb b/meta-lsb/packages/qt-apps/qmmp_0.4.1.bb
deleted file mode 100644
index 5f971e8b47..0000000000
--- a/meta-lsb/packages/qt-apps/qmmp_0.4.1.bb
+++ /dev/null
@@ -1,32 +0,0 @@
1DESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an audio-player, written with help of Qt library"
2HOMEPAGE = "http://qmmp.ylsoftware.com"
3LICENSE = "GPLv2"
4SECTION = "multimedia"
5
6DEPENDS = "qt4-x11-free"
7RDEPENDS = "qt4-x11-free libmad libvorbis libogg taglib alsa-lib curl"
8
9SRC_URI = "http://qmmp.ylsoftware.com/files/qmmp-0.4.1.tar.bz2"
10
11PARALLEL_MAKE = ""
12
13inherit qmake2 pkgconfig
14
15do_configure_prepend() {
16 # fix qt4 lrelease name
17 sed -i -e 's/lrelease-qt4/lrelease4/' ${S}/qmmp.pro
18
19 # disable the unsupported plugin
20 for plugin in sndfile wavpack ; do
21 sed -i -e "s/$plugin//" ${S}/src/plugins/Input/Input.pro
22 done
23 sed -i -e 's/mms//' ${S}/src/plugins/Transports/Transports.pro
24 sed -i -e 's/srconverter//' ${S}/src/plugins/Effect/Effect.pro
25
26 sed -i -e 's/^CONFIG/#CONFIG/' ${S}/qmmp.pri
27 sed -i -e 's/CONFIG += WITH_ENCA/#CONFIG += WITH_ENCA/' ${S}/qmmp.pri
28}
29
30do_install() {
31 oe_runmake INSTALL_ROOT=${D} install
32}
diff --git a/meta-lsb/packages/qt-apps/quicky_0.4.bb b/meta-lsb/packages/qt-apps/quicky_0.4.bb
deleted file mode 100644
index ece8ead926..0000000000
--- a/meta-lsb/packages/qt-apps/quicky_0.4.bb
+++ /dev/null
@@ -1,16 +0,0 @@
1DESCRIPTION = "A simple note-taking application with Wiki-style syntax and behaviour"
2HOMEPAGE = "http://qt-apps.org/content/show.php/Quicky?content=80325"
3LICENSE = "GPLv2+"
4SECTION = "x11/apps"
5
6DEPENDS = "qt4-x11-free"
7RDEPENDS = "qt4-x11-free"
8
9SRC_URI = "http://qt-apps.org/CONTENT/content-files/80325-quicky-0.4.tar.gz"
10
11inherit qmake2 pkgconfig
12
13do_install() {
14 install -d ${D}${bindir}
15 install -m 0755 ${S}/${PN} ${D}${bindir}
16}
diff --git a/meta-lsb/packages/qt4/files/0001-cross-compile.patch b/meta-lsb/packages/qt4/files/0001-cross-compile.patch
deleted file mode 100644
index 053be06e54..0000000000
--- a/meta-lsb/packages/qt4/files/0001-cross-compile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Add configure option "crossarch" for cross compiling
2
3Ported from OE by: Yu Ke <ke.yu@intel.com>
4
5Index: qt-embedded-linux-opensource-src-4.4.3/configure
6===================================================================
7--- qt-embedded-linux-opensource-src-4.4.3.orig/configure 2009-03-26 17:02:45.000000000 +0100
8+++ qt-embedded-linux-opensource-src-4.4.3/configure 2009-03-26 17:03:43.000000000 +0100
9@@ -726,7 +726,7 @@
10 UNKNOWN_ARG=yes
11 fi
12 ;;
13- -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
14+ -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch)
15 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
16 shift
17 VAL="$1"
18@@ -1143,6 +1143,9 @@
19 xplatform)
20 XPLATFORM="$VAL"
21 ;;
22+ crossarch)
23+ CROSSARCH="$VAL"
24+ ;;
25 debug-and-release)
26 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
27 CFG_DEBUG_RELEASE="$VAL"
28@@ -2405,6 +2408,8 @@
29 CFG_ARCH=$CFG_HOST_ARCH
30 fi
31
32+CFG_ARCH="$CROSSARCH"
33+
34 if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
35 if [ "$OPT_VERBOSE" = "yes" ]; then
36 echo " '$CFG_ARCH' is supported"
diff --git a/meta-lsb/packages/qt4/files/0002-fix-resinit-declaration.patch b/meta-lsb/packages/qt4/files/0002-fix-resinit-declaration.patch
deleted file mode 100644
index be4d5c0e22..0000000000
--- a/meta-lsb/packages/qt4/files/0002-fix-resinit-declaration.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1From acfeb18aa94bad6b2066e91cd15570889baaa252 Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net>
3Date: Sat, 2 Jun 2007 16:04:01 +0200
4Subject: [PATCH] fix resinit declaration
5
6---
7 src/qt3support/network/q3dns.cpp | 2 +-
8 1 files changed, 1 insertions(+), 1 deletions(-)
9
10Index: qt-embedded-linux-opensource-src-4.4.3/src/qt3support/network/q3dns.cpp
11===================================================================
12--- qt-embedded-linux-opensource-src-4.4.3.orig/src/qt3support/network/q3dns.cpp 2008-09-27 11:01:28.000000000 +0200
13+++ qt-embedded-linux-opensource-src-4.4.3/src/qt3support/network/q3dns.cpp 2009-03-26 17:04:05.000000000 +0100
14@@ -44,7 +44,7 @@
15 # include <netinet/in.h>
16 # include <arpa/nameser.h>
17 # include <resolv.h>
18-extern "C" int res_init();
19+extern "C" int res_init() throw();
20 #endif
21
22 // POSIX Large File Support redefines open -> open64
diff --git a/meta-lsb/packages/qt4/files/0004-no-qmake.patch b/meta-lsb/packages/qt4/files/0004-no-qmake.patch
deleted file mode 100644
index a58b19f904..0000000000
--- a/meta-lsb/packages/qt4/files/0004-no-qmake.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From f5a73ce944240de9013cc23288c115e8213add5e Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net>
3Date: Sat, 2 Jun 2007 16:06:59 +0200
4Subject: [PATCH] no qmake
5
6qmake is already built in qt4-tools-native, so disable it
7
8Ported from OE by: Yu Ke <ke.yu@intel.com>
9
10---
11 configure | 2 +-
12 1 files changed, 1 insertions(+), 1 deletions(-)
13
14Index: qt-embedded-linux-opensource-src-4.4.3/configure
15===================================================================
16--- qt-embedded-linux-opensource-src-4.4.3.orig/configure 2009-03-26 17:03:43.000000000 +0100
17+++ qt-embedded-linux-opensource-src-4.4.3/configure 2009-03-26 17:04:17.000000000 +0100
18@@ -3786,7 +3786,7 @@
19 }
20
21 # build qmake
22-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
23+if false; then ###[ '!' -f "$outpath/bin/qmake" ];
24 echo "Creating qmake. Please wait..."
25
26 OLD_QCONFIG_H=
diff --git a/meta-lsb/packages/qt4/files/0006-freetype-host-includes.patch b/meta-lsb/packages/qt4/files/0006-freetype-host-includes.patch
deleted file mode 100644
index 081d8992ef..0000000000
--- a/meta-lsb/packages/qt4/files/0006-freetype-host-includes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net>
3Date: Mon, 4 Jun 2007 14:48:50 +0200
4Subject: [PATCH] freetype host includes
5
6Host include path should not be used in corss compiling case.
7
8Ported from OE by: Yu Ke <ke.yu@intel.com>
9
10---
11 config.tests/unix/freetype/freetype.pri | 2 +-
12 1 files changed, 1 insertions(+), 1 deletions(-)
13
14Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri
15===================================================================
16--- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/freetype/freetype.pri 2009-02-25 22:32:32.000000000 +0100
17+++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri 2009-03-26 17:14:16.000000000 +0100
18@@ -1,5 +1,5 @@
19 !cross_compile {
20- TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
21+ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
22 # LSB doesn't allow using headers from /include or /usr/include
23 linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
24 for(p, TRY_INCLUDEPATHS) {
diff --git a/meta-lsb/packages/qt4/files/0008-qt-lib-infix.patch b/meta-lsb/packages/qt4/files/0008-qt-lib-infix.patch
deleted file mode 100644
index a1b89124dd..0000000000
--- a/meta-lsb/packages/qt4/files/0008-qt-lib-infix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Add lib infix to distinguish different qt compile version: e.g. "E" for embedded, "" for X11
2
3Ported from OE by: Yu Ke <ke.yu@intel.com>
4
5--- /tmp/uitools.prf 2009-12-01 18:38:22.000000000 +0100
6+++ qt-everywhere-opensource-src-4.6.0/mkspecs/features/uitools.prf 2009-12-01 18:58:16.000000000 +0100
7@@ -3,11 +3,11 @@
8
9 # Include the correct version of the UiLoader library
10 symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib
11-else: QTUITOOLS_LINKAGE = -lQtUiTools
12+else: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
13
14 CONFIG(debug, debug|release) {
15- mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug
16- win32: QTUITOOLS_LINKAGE = -lQtUiToolsd
17+ mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
18+ win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
19 }
20 LIBS += $$QTUITOOLS_LINKAGE
21
22--- /tmp/uitools.pro 2009-12-01 18:40:28.000000000 +0100
23+++ qt-everywhere-opensource-src-4.6.0/tools/designer/src/uitools/uitools.pro 2009-12-01 18:59:18.000000000 +0100
24@@ -1,5 +1,5 @@
25 TEMPLATE = lib
26-TARGET = $$qtLibraryTarget(QtUiTools)
27+TARGET = QtUiTools
28 QT += xml
29 CONFIG += qt staticlib
30 DESTDIR = ../../../../lib
31@@ -43,3 +43,5 @@
32 QMAKE_PKGCONFIG_DESTDIR = pkgconfig
33 QMAKE_PKGCONFIG_REQUIRES += QtXml
34 }
35+
36+TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
diff --git a/meta-lsb/packages/qt4/files/0009-support-2bpp.patch b/meta-lsb/packages/qt4/files/0009-support-2bpp.patch
deleted file mode 100644
index cf44ea8214..0000000000
--- a/meta-lsb/packages/qt4/files/0009-support-2bpp.patch
+++ /dev/null
@@ -1,299 +0,0 @@
1Add 2bpp support
2
3Ported from OE by: Yu Ke <ke.yu@intel.com>
4
5diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/configure qt-embedded-linux-opensource-src-4.4.3/configure
6--- qt-embedded-linux-opensource-src-4.4.3.orig/configure 2008-09-27 11:01:23.000000000 +0200
7+++ qt-embedded-linux-opensource-src-4.4.3/configure 2009-01-14 14:30:53.000000000 +0100
8@@ -5045,6 +5045,7 @@
9 echo "Choose pixel-depths to support:"
10 echo
11 echo " 1. 1bpp, black/white"
12+ echo " 2. 2bpp, grayscale"
13 echo " 4. 4bpp, grayscale"
14 echo " 8. 8bpp, paletted"
15 echo " 12. 12bpp, rgb 4-4-4"
16@@ -5063,11 +5064,11 @@
17 fi
18 if [ -n "$CFG_QWS_DEPTHS" -a "$PLATFORM_QWS" = "yes" ]; then
19 if [ "$CFG_QWS_DEPTHS" = "all" ]; then
20- CFG_QWS_DEPTHS="1 4 8 12 15 16 18 24 32 generic"
21+ CFG_QWS_DEPTHS="1 2 4 8 12 15 16 18 24 32 generic"
22 fi
23 for D in `echo "$CFG_QWS_DEPTHS" | sed -e 's/,/ /g'`; do
24 case $D in
25- 1|4|8|12|15|16|18|24|32) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_$D";;
26+ 1|2|4|8|12|15|16|18|24|32) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_$D";;
27 generic) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_GENERIC";;
28 esac
29 done
30diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreenlinuxfb_qws.cpp qt-embedded-linux-opensource-src-4.4.3/src/gui/embedded/qscreenlinuxfb_qws.cpp
31--- qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreenlinuxfb_qws.cpp 2008-09-27 11:01:28.000000000 +0200
32+++ qt-embedded-linux-opensource-src-4.4.3/src/gui/embedded/qscreenlinuxfb_qws.cpp 2009-01-14 17:22:34.000000000 +0100
33@@ -404,8 +404,8 @@
34 setupOffScreen();
35
36 // Now read in palette
37- if((vinfo.bits_per_pixel==8) || (vinfo.bits_per_pixel==4)) {
38- screencols= (vinfo.bits_per_pixel==8) ? 256 : 16;
39+ if((vinfo.bits_per_pixel==8) || (vinfo.bits_per_pixel==4) || (vinfo.bits_per_pixel==2)) {
40+ screencols= 1 << vinfo.bits_per_pixel;
41 int loopc;
42 fb_cmap startcmap;
43 startcmap.start=0;
44diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreen_qws.cpp qt-embedded-linux-opensource-src-4.4.3/src/gui/embedded/qscreen_qws.cpp
45--- qt-embedded-linux-opensource-src-4.4.3.orig/src/gui/embedded/qscreen_qws.cpp 2008-09-27 11:01:28.000000000 +0200
46+++ qt-embedded-linux-opensource-src-4.4.3/src/gui/embedded/qscreen_qws.cpp 2009-01-14 17:22:44.000000000 +0100
47@@ -444,6 +444,58 @@
48 }
49 #endif // QT_QWS_DEPTH_4
50
51+#ifdef QT_QWS_DEPTH_2
52+static inline void qt_rectfill_gray2(quint8 *dest, quint8 value,
53+ int x, int y, int width, int height,
54+ int stride)
55+{
56+ const int pixelsPerByte = 4;
57+ const int alignWidth = qMin(width, (4 - (x & 3)) & 3);
58+ const int doAlign = (alignWidth > 0 ? 1 : 0);
59+ const int alignStart = pixelsPerByte - 1 - (x & 3);
60+ const int alignStop = alignStart - (alignWidth - 1);
61+ const quint8 alignMask = ((1 << (2 * alignWidth)) - 1) << (2 * alignStop);
62+ const int tailWidth = (width - alignWidth) & 3;
63+ const int doTail = (tailWidth > 0 ? 1 : 0);
64+ const quint8 tailMask = (1 << (2 * (pixelsPerByte - tailWidth))) - 1;
65+ const int width8 = (width - alignWidth) / pixelsPerByte;
66+
67+ dest += y * stride + x / pixelsPerByte;
68+ stride -= (doAlign + width8);
69+
70+ for (int j = 0; j < height; ++j) {
71+ if (doAlign) {
72+ *dest = (*dest & ~alignMask) | (value & alignMask);
73+ ++dest;
74+ }
75+ if (width8) {
76+ qt_memfill<quint8>(dest, value, width8);
77+ dest += width8;
78+ }
79+ if (doTail)
80+ *dest = (*dest & tailMask) | (value & ~tailMask);
81+ dest += stride;
82+ }
83+}
84+
85+static void solidFill_gray2(QScreen *screen, const QColor &color,
86+ const QRegion &region)
87+{
88+ quint8 *dest = reinterpret_cast<quint8*>(screen->base());
89+ const quint8 c = qGray(color.rgba()) >> 6;
90+ const quint8 c8 = (c << 6) | (c << 4) | (c << 2) | c;
91+
92+ const int stride = screen->linestep();
93+ const QVector<QRect> rects = region.rects();
94+
95+ for (int i = 0; i < rects.size(); ++i) {
96+ const QRect r = rects.at(i);
97+ qt_rectfill_gray2(dest, c8, r.x(), r.y(), r.width(), r.height(),
98+ stride);
99+ }
100+}
101+#endif // QT_QWS_DEPTH_2
102+
103 #ifdef QT_QWS_DEPTH_1
104 static inline void qt_rectfill_mono(quint8 *dest, quint8 value,
105 int x, int y, int width, int height,
106@@ -551,6 +603,11 @@
107 screen->d_ptr->solidFill = solidFill_gray4;
108 break;
109 #endif
110+#ifdef QT_QWS_DEPTH_2
111+ case 2:
112+ screen->d_ptr->solidFill = solidFill_gray2;
113+ break;
114+#endif
115 #ifdef QT_QWS_DEPTH_1
116 case 1:
117 screen->d_ptr->solidFill = solidFill_mono;
118@@ -958,6 +1015,149 @@
119 }
120 #endif // QT_QWS_DEPTH_4
121
122+#ifdef QT_QWS_DEPTH_2
123+
124+struct qgray2 { quint8 dummy; } Q_PACKED;
125+
126+template <typename SRC>
127+static inline quint8 qt_convertToGray2(SRC color);
128+
129+template <>
130+inline quint8 qt_convertToGray2(quint32 color)
131+{
132+ return qGray(color) >> 6;
133+}
134+
135+template <>
136+inline quint8 qt_convertToGray2(quint16 color)
137+{
138+ const int r = (color & 0xf800) >> 11;
139+ const int g = (color & 0x07e0) >> 6; // only keep 5 bit
140+ const int b = (color & 0x001f);
141+ return (r * 11 + g * 16 + b * 5) >> 8;
142+}
143+
144+template <>
145+inline quint8 qt_convertToGray2(qrgb444 color)
146+{
147+ return qt_convertToGray2(quint32(color));
148+}
149+
150+template <>
151+inline quint8 qt_convertToGray2(qargb4444 color)
152+{
153+ return qt_convertToGray2(quint32(color));
154+}
155+
156+template <typename SRC>
157+static inline void qt_rectconvert_gray2(qgray2 *dest2, const SRC *src,
158+ int x, int y, int width, int height,
159+ int dstStride, int srcStride)
160+{
161+ const int pixelsPerByte = 4;
162+ quint8 *dest8 = reinterpret_cast<quint8*>(dest2)
163+ + y * dstStride + x / pixelsPerByte;
164+ const int alignWidth = qMin(width, (4 - (x & 3)) & 3);
165+ const int doAlign = (alignWidth > 0 ? 1 : 0);
166+ const int alignStart = pixelsPerByte - 1 - (x & 3);
167+ const int alignStop = alignStart - (alignWidth - 1);
168+ const quint8 alignMask = ((1 << (2 * alignWidth)) - 1) << (2 * alignStop);
169+ const int tailWidth = (width - alignWidth) & 3;
170+ const int doTail = (tailWidth > 0 ? 1 : 0);
171+ const quint8 tailMask = (1 << (2 * (pixelsPerByte - tailWidth))) - 1;
172+ const int width8 = (width - alignWidth) / pixelsPerByte;
173+
174+ srcStride = srcStride / sizeof(SRC) - (width8 * pixelsPerByte + alignWidth);
175+ dstStride -= (width8 + doAlign);
176+
177+ for (int j = 0; j < height; ++j) {
178+ if (doAlign) {
179+ quint8 d = *dest8 & ~alignMask;
180+ for (int i = alignStart; i >= alignStop; --i)
181+ d |= qt_convertToGray2<SRC>(*src++) << (2 * i);
182+ *dest8++ = d;
183+ }
184+ for (int i = 0; i < width8; ++i) {
185+ *dest8 = (qt_convertToGray2<SRC>(src[0]) << 6)
186+ | (qt_convertToGray2<SRC>(src[1]) << 4)
187+ | (qt_convertToGray2<SRC>(src[2]) << 2)
188+ | (qt_convertToGray2<SRC>(src[3]));
189+ src += 4;
190+ ++dest8;
191+ }
192+ if (doTail) {
193+ quint8 d = *dest8 & tailMask;
194+ switch (tailWidth) {
195+ case 3: d |= qt_convertToGray2<SRC>(src[2]) << 2;
196+ case 2: d |= qt_convertToGray2<SRC>(src[1]) << 4;
197+ case 1: d |= qt_convertToGray2<SRC>(src[0]) << 6;
198+ }
199+ *dest8 = d;
200+ }
201+
202+ dest8 += dstStride;
203+ src += srcStride;
204+ }
205+}
206+
207+template <>
208+void qt_rectconvert(qgray2 *dest, const quint32 *src,
209+ int x, int y, int width, int height,
210+ int dstStride, int srcStride)
211+{
212+ qt_rectconvert_gray2<quint32>(dest, src, x, y, width, height,
213+ dstStride, srcStride);
214+}
215+
216+template <>
217+void qt_rectconvert(qgray2 *dest, const quint16 *src,
218+ int x, int y, int width, int height,
219+ int dstStride, int srcStride)
220+{
221+ qt_rectconvert_gray2<quint16>(dest, src, x, y, width, height,
222+ dstStride, srcStride);
223+}
224+
225+template <>
226+void qt_rectconvert(qgray2 *dest, const qrgb444 *src,
227+ int x, int y, int width, int height,
228+ int dstStride, int srcStride)
229+{
230+ qt_rectconvert_gray2<qrgb444>(dest, src, x, y, width, height,
231+ dstStride, srcStride);
232+}
233+
234+template <>
235+void qt_rectconvert(qgray2 *dest, const qargb4444 *src,
236+ int x, int y, int width, int height,
237+ int dstStride, int srcStride)
238+{
239+ qt_rectconvert_gray2<qargb4444>(dest, src, x, y, width, height,
240+ dstStride, srcStride);
241+}
242+
243+static void blit_2(QScreen *screen, const QImage &image,
244+ const QPoint &topLeft, const QRegion &region)
245+{
246+ switch (image.format()) {
247+ case QImage::Format_ARGB32_Premultiplied:
248+ blit_template<qgray2, quint32>(screen, image, topLeft, region);
249+ return;
250+ case QImage::Format_RGB16:
251+ blit_template<qgray2, quint16>(screen, image, topLeft, region);
252+ return;
253+ case QImage::Format_RGB444:
254+ blit_template<qgray2, qrgb444>(screen, image, topLeft, region);
255+ return;
256+ case QImage::Format_ARGB4444_Premultiplied:
257+ blit_template<qgray2, qargb4444>(screen, image, topLeft, region);
258+ return;
259+ default:
260+ qCritical("blit_2(): Image format %d not supported!", image.format());
261+ }
262+}
263+#endif // QT_QWS_DEPTH_2
264+
265 #ifdef QT_QWS_DEPTH_1
266
267 struct qmono { quint8 dummy; } Q_PACKED;
268@@ -1206,6 +1406,11 @@
269 screen->d_ptr->blit = blit_4;
270 break;
271 #endif
272+#ifdef QT_QWS_DEPTH_2
273+ case 2:
274+ screen->d_ptr->blit = blit_2;
275+ break;
276+#endif
277 #ifdef QT_QWS_DEPTH_1
278 case 1:
279 screen->d_ptr->blit = blit_1;
280@@ -2056,6 +2261,8 @@
281 }
282 } else if (d == 4) {
283 ret = qGray(r, g, b) >> 4;
284+ } else if (d == 2) {
285+ ret = qGray(r, g, b) >> 6;
286 } else if (d == 1) {
287 ret = qGray(r, g, b) >= 128;
288 } else {
289@@ -2126,6 +2333,10 @@
290 } else if(d==1) {
291 return true;
292 #endif
293+#ifdef QT_QWS_DEPTH_2
294+ } else if(d==2) {
295+ return true;
296+#endif
297 #ifdef QT_QWS_DEPTH_4
298 } else if(d==4) {
299 return true;
diff --git a/meta-lsb/packages/qt4/files/0010-no-simpledecoration-example.patch b/meta-lsb/packages/qt4/files/0010-no-simpledecoration-example.patch
deleted file mode 100644
index e52736926f..0000000000
--- a/meta-lsb/packages/qt4/files/0010-no-simpledecoration-example.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1
2Ported from OE by: Yu Ke <ke.yu@intel.com>
3
4--- /tmp/qws.pro 2009-12-10 19:30:08.000000000 +0100
5+++ qt-everywhere-opensource-src-4.6.0/examples/qws/qws.pro 2009-12-10 19:30:21.000000000 +0100
6@@ -1,7 +1,7 @@
7 TEMPLATE = subdirs
8 # no /dev/fbX
9 !qnx:!vxworks:SUBDIRS = framebuffer
10-SUBDIRS += mousecalibration simpledecoration
11+SUBDIRS += mousecalibration
12
13 # install
14 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro
diff --git a/meta-lsb/packages/qt4/files/fix-config-tests.patch b/meta-lsb/packages/qt4/files/fix-config-tests.patch
deleted file mode 100644
index 21054555bc..0000000000
--- a/meta-lsb/packages/qt4/files/fix-config-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Fix invocation in case of "ccache some-compiler-gcc". As the command "ccache some-compiler-gcc" will not exist but "ccache" will.
2
3both visibility and relocs were affected.
4
5Ported from OE by: Yu Ke <ke.yu@intel.com>
6
7Index: qt-x11-opensource-src-4.5.2/config.tests/unix/bsymbolic_functions.test
8===================================================================
9--- qt-x11-opensource-src-4.5.2.orig/config.tests/unix/bsymbolic_functions.test 2009-08-01 08:01:11.000000000 +0200
10+++ qt-x11-opensource-src-4.5.2/config.tests/unix/bsymbolic_functions.test 2009-08-01 08:01:16.000000000 +0200
11@@ -8,7 +8,7 @@
12 int main() { return 0; }
13 EOF
14
15-"$COMPILER" -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c >/dev/null 2>&1 && BSYMBOLIC_FUNCTIONS_SUPPORT=yes
16+$COMPILER -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c >/dev/null 2>&1 && BSYMBOLIC_FUNCTIONS_SUPPORT=yes
17 rm -f bsymbolic_functions.c libtest.so
18
19 # done
20Index: qt-x11-opensource-src-4.5.2/config.tests/unix/fvisibility.test
21===================================================================
22--- qt-x11-opensource-src-4.5.2.orig/config.tests/unix/fvisibility.test 2009-06-20 06:57:50.000000000 +0200
23+++ qt-x11-opensource-src-4.5.2/config.tests/unix/fvisibility.test 2009-08-01 07:59:05.000000000 +0200
24@@ -15,9 +15,9 @@
25 EOF
26
27 if [ "$VERBOSE" = "yes" ] ; then
28- "$COMPILER" -c -fvisibility=hidden fvisibility.c && FVISIBILITY_SUPPORT=yes
29+ $COMPILER -c -fvisibility=hidden fvisibility.c && FVISIBILITY_SUPPORT=yes
30 else
31- "$COMPILER" -c -fvisibility=hidden fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes
32+ $COMPILER -c -fvisibility=hidden fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes
33 fi
34 rm -f fvisibility.c fvisibility.o
35 }
36
diff --git a/meta-lsb/packages/qt4/files/g++.conf b/meta-lsb/packages/qt4/files/g++.conf
deleted file mode 100644
index 4cd76e62ea..0000000000
--- a/meta-lsb/packages/qt4/files/g++.conf
+++ /dev/null
@@ -1,53 +0,0 @@
1#
2# qmake configuration for common gcc
3#
4
5QMAKE_CC = $(OE_QMAKE_CC)
6QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS)
7QMAKE_CFLAGS_DEPS += -M
8QMAKE_CFLAGS_WARN_ON += -Wall -W
9QMAKE_CFLAGS_WARN_OFF += -w
10QMAKE_CFLAGS_RELEASE +=
11QMAKE_CFLAGS_DEBUG += -g
12QMAKE_CFLAGS_SHLIB += -fPIC
13QMAKE_CFLAGS_STATIC_LIB += -fPIC
14QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
15QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
16QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
17QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
18
19QMAKE_CXX = $(OE_QMAKE_CXX)
20QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
21QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
22QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
23QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
24QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
25QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
26QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
27QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
28QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
29QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
30QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
31QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
32
33QMAKE_LINK = $(OE_QMAKE_LINK)
34QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
35QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
36QMAKE_LFLAGS_RELEASE +=
37QMAKE_LFLAGS_DEBUG +=
38QMAKE_LFLAGS_APP +=
39QMAKE_LFLAGS_SHLIB += -shared
40QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
41QMAKE_LFLAGS_SONAME += -Wl,-soname,
42QMAKE_LFLAGS_THREAD +=
43QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
44QMAKE_RPATH = -Wl,-rpath-link,
45
46QMAKE_PCH_OUTPUT_EXT = .gch
47
48# -Bsymbolic-functions (ld) support
49QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
50QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
51
52# for the SDK
53isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
diff --git a/meta-lsb/packages/qt4/files/hack-out-pg_config.patch b/meta-lsb/packages/qt4/files/hack-out-pg_config.patch
deleted file mode 100644
index 650ed7745e..0000000000
--- a/meta-lsb/packages/qt4/files/hack-out-pg_config.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1Hack to not use the pg_config of the host system which will add /usr/include
2
3pg_config is a native binary so using that when cross compiling
4will always fail. The commented out fix would do, but for OE
5our -platform and -xplatform is the same so we are actually not
6really cross compiling. Just comment out the test, we are passing
7the location to the postgres headers and if they are okay we
8will padd.
9
10Ported from OE by: Yu Ke <ke.yu@intel.com>
11
12Index: qt-embedded-linux-opensource-src-4.5.2/configure
13===================================================================
14--- qt-embedded-linux-opensource-src-4.5.2.orig/configure 2009-08-10 03:03:04.000000000 +0200
15+++ qt-embedded-linux-opensource-src-4.5.2/configure 2009-08-10 03:58:11.000000000 +0200
16@@ -4401,10 +4402,10 @@
17 ;;
18 psql)
19 if [ "$CFG_SQL_psql" != "no" ]; then
20- if "$WHICH" pg_config >/dev/null 2>&1; then
21- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
22- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
23- fi
24+# if [ "$QT_CROSS_COMPILE" = "no" ] && "$WHICH" pg_config >/dev/null 2>&1; then
25+# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
26+# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
27+# fi
28 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
29 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
30 if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then
diff --git a/meta-lsb/packages/qt4/files/linux.conf b/meta-lsb/packages/qt4/files/linux.conf
deleted file mode 100644
index 90b8d65aba..0000000000
--- a/meta-lsb/packages/qt4/files/linux.conf
+++ /dev/null
@@ -1,54 +0,0 @@
1#
2# qmake configuration for common linux
3#
4
5QMAKE_CFLAGS_THREAD += -D_REENTRANT
6QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
7
8QMAKE_INCDIR =
9QMAKE_LIBDIR =
10QMAKE_INCDIR_X11 =
11QMAKE_LIBDIR_X11 =
12QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT)
13QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT)
14QMAKE_INCDIR_OPENGL =
15QMAKE_LIBDIR_OPENGL =
16
17
18QMAKE_LIBS =
19QMAKE_LIBS_DYNLOAD = -ldl
20QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
21QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
22QMAKE_LIBS_NIS = -lnsl
23QMAKE_LIBS_OPENGL = -lGLU -lGL
24QMAKE_LIBS_OPENGL_QT = -lGL
25QMAKE_LIBS_THREAD = -lpthread
26
27QMAKE_MOC = $(OE_QMAKE_MOC)
28QMAKE_UIC = $(OE_QMAKE_UIC)
29QMAKE_UIC3 = $(OE_QMAKE_UIC3)
30QMAKE_RCC = $(OE_QMAKE_RCC)
31QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML)
32QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP)
33
34QMAKE_AR = $(OE_QMAKE_AR) cqs
35QMAKE_OBJCOPY = objcopy
36QMAKE_RANLIB =
37
38QMAKE_TAR = tar -cf
39QMAKE_GZIP = gzip -9f
40
41QMAKE_COPY = cp -f
42QMAKE_COPY_FILE = $(COPY)
43QMAKE_COPY_DIR = $(COPY) -r
44QMAKE_MOVE = mv -f
45QMAKE_DEL_FILE = rm -f
46QMAKE_DEL_DIR = rmdir
47QMAKE_STRIP = $(OE_QMAKE_STRIP)
48QMAKE_STRIPFLAGS_LIB += --strip-unneeded
49QMAKE_CHK_DIR_EXISTS = test -d
50QMAKE_MKDIR = mkdir -p
51QMAKE_INSTALL_FILE = install -m 644 -p
52QMAKE_INSTALL_PROGRAM = install -m 755 -p
53
54include(unix.conf)
diff --git a/meta-lsb/packages/qt4/files/qt-config.patch b/meta-lsb/packages/qt4/files/qt-config.patch
deleted file mode 100644
index a31e7b3e2a..0000000000
--- a/meta-lsb/packages/qt4/files/qt-config.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1
2Ported from OE by: Yu Ke <ke.yu@intel.com>
3
4--- /tmp/qlibraryinfo.cpp 2008-08-02 17:16:41.000000000 +0200
5+++ qt-embedded-linux-opensource-src-4.4.1/src/corelib/global/qlibraryinfo.cpp 2008-08-02 17:17:42.000000000 +0200
6@@ -47,6 +47,7 @@
7 QT_BEGIN_NAMESPACE
8 extern QString qmake_libraryInfoFile();
9 QT_END_NAMESPACE
10+#include <stdlib.h>
11 #else
12 # include "qcoreapplication.h"
13 #endif
14@@ -113,6 +114,10 @@
15 #ifdef QT_BUILD_QMAKE
16 if(!QFile::exists(qtconfig))
17 qtconfig = qmake_libraryInfoFile();
18+ if (!QFile::exists(qtconfig)) {
19+ QByteArray config = getenv("QT_CONF_PATH");
20+ qtconfig = QFile::decodeName(config);
21+ }
22 #else
23 if (!QFile::exists(qtconfig) && QCoreApplication::instance()) {
24 #ifdef Q_OS_MAC
diff --git a/meta-lsb/packages/qt4/qt-4.6.3.inc b/meta-lsb/packages/qt4/qt-4.6.3.inc
deleted file mode 100644
index 9f4e221bb5..0000000000
--- a/meta-lsb/packages/qt4/qt-4.6.3.inc
+++ /dev/null
@@ -1,65 +0,0 @@
1LICENSE = "LGPLv2.1 | GPLv3"
2LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
3 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
4 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
5
6SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
7 file://0001-cross-compile.patch \
8 file://0002-fix-resinit-declaration.patch \
9 file://0004-no-qmake.patch \
10 file://0006-freetype-host-includes.patch \
11 file://0008-qt-lib-infix.patch \
12 file://0009-support-2bpp.patch \
13 file://0010-no-simpledecoration-example.patch \
14 file://fix-config-tests.patch \
15 file://qt-config.patch \
16 file://g++.conf \
17 file://linux.conf \
18 file://hack-out-pg_config.patch \
19 "
20
21S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
22
23do_configure_prepend() {
24 for pro in $(find ${S} -name "*.pro") ; do
25 sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro
26 done
27
28 sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
29 sed -i \
30 -e /QMAKE_MOC\ /d \
31 -e /QMAKE_UIC\ /d \
32 -e /QMAKE_UIC3\ /d \
33 -e /QMAKE_RCC\ /d \
34 ${S}/configure
35}
36
37do_configure_append() {
38 sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile
39}
40
41QT_GLFLAGS ?= ""
42QT_CONFIG_FLAGS += " -no-rpath -qt3support -silent ${QT_GLFLAGS}"
43
44do_compile() {
45 # Fixup missing wsegl header in some SGX SDKs
46 if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
47 cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/
48 fi
49
50 unset CFLAGS CXXFLAGS
51 oe_runmake ${EXTRA_ENV}
52}
53
54do_install_append() {
55 install -d ${D}${bindir}
56 for i in rcc uic moc ; do
57 install -m 0755 ${S}/bin/$i ${D}${bindir}/
58 done
59
60 #Append an E to the qtdemo file
61 if [ -n "${QT_LIBINFIX}" ] ; then
62 mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
63 fi
64}
65
diff --git a/meta-lsb/packages/qt4/qt4-tools-native.inc b/meta-lsb/packages/qt4/qt4-tools-native.inc
deleted file mode 100644
index 7621d629f1..0000000000
--- a/meta-lsb/packages/qt4/qt4-tools-native.inc
+++ /dev/null
@@ -1,74 +0,0 @@
1DESCRIPTION = "Native tools for Qt/[X11|Mac|Embedded] version 4.x"
2DEPENDS = "zlib-native dbus-native libsm-native"
3SECTION = "libs"
4HOMEPAGE = "http://qt.nokia.com"
5PRIORITY = "optional"
6
7inherit native
8
9SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
10 file://qt-config.patch \
11 file://g++.conf \
12 file://linux.conf"
13S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
14
15EXTRA_OECONF = "-prefix ${prefix} \
16 -L ${STAGING_LIBDIR_NATIVE} \
17 -I ${STAGING_INCDIR_NATIVE} \
18 -qt-libjpeg -qt-gif -system-zlib \
19 -no-libjpeg -no-libpng \
20 -no-accessibility \
21 -no-cups \
22 -no-exceptions \
23 -no-nas-sound \
24 -no-nis \
25 -verbose -release -static \
26 -qt3support"
27
28# yank default -e, otherwise we get the following error:
29# moc_qbuffer.cpp: No such file or directory
30EXTRA_OEMAKE = " "
31
32do_configure() {
33 (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
34}
35
36TOBUILD = "\
37 src/tools/moc \
38 src/corelib \
39 src/sql \
40 src/dbus \
41 src/qt3support \
42 src/xml \
43 src/tools/uic \
44 src/tools/rcc \
45 src/network \
46 src/gui \
47 src/tools/uic3 \
48 tools/linguist/lrelease \
49 tools/linguist/lupdate \
50 tools/qdbus \
51"
52
53do_compile() {
54 for i in ${TOBUILD}; do
55 cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
56 done
57}
58
59NATIVE_INSTALL_WORKS = "1"
60
61do_install() {
62 install -d ${D}${bindir}/
63 install -m 0755 bin/qmake ${D}${bindir}/qmake2
64 for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do
65 install -m 0755 bin/${i} ${D}${bindir}/${i}4
66 done
67
68 install -d ${D}${datadir}/qt4/
69 cp -PfR mkspecs ${D}${datadir}/qt4/
70 ln -sf linux-g++ ${D}${datadir}/qt4/mkspecs/${BUILD_OS}-oe-g++
71 cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf ${D}${datadir}/qt4/mkspecs/common/
72
73 install -m 0644 tools/porting/src/q3porting.xml ${D}${datadir}/qt4/
74}
diff --git a/meta-lsb/packages/qt4/qt4-tools-native_4.6.3.bb b/meta-lsb/packages/qt4/qt4-tools-native_4.6.3.bb
deleted file mode 100644
index de24b38dea..0000000000
--- a/meta-lsb/packages/qt4/qt4-tools-native_4.6.3.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1require qt4-tools-native.inc
2
3LICENSE = "LGPLv2.1 | GPLv3"
4LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
5 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
6 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
7PR = "r0"
8
9EXTRA_OECONF += " -no-fast -silent -no-rpath"
10
11TOBUILD := "src/tools/bootstrap ${TOBUILD}"
diff --git a/meta-lsb/packages/qt4/qt4-x11-free-4.6.3/linux.conf b/meta-lsb/packages/qt4/qt4-x11-free-4.6.3/linux.conf
deleted file mode 100644
index 68ae80b929..0000000000
--- a/meta-lsb/packages/qt4/qt4-x11-free-4.6.3/linux.conf
+++ /dev/null
@@ -1,54 +0,0 @@
1#
2# qmake configuration for common linux
3#
4
5QMAKE_CFLAGS_THREAD += -D_REENTRANT
6QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
7
8QMAKE_INCDIR =
9QMAKE_LIBDIR =
10QMAKE_INCDIR_X11 =
11QMAKE_LIBDIR_X11 =
12QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT)
13QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT)
14QMAKE_INCDIR_OPENGL =
15QMAKE_LIBDIR_OPENGL =
16
17
18QMAKE_LIBS = -Wl,-rpath-link,SEDME/lib -lglib-2.0
19QMAKE_LIBS_DYNLOAD = -ldl
20QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
21QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
22QMAKE_LIBS_NIS = -lnsl
23QMAKE_LIBS_OPENGL = -lGLU -lGL
24QMAKE_LIBS_OPENGL_QT = -lGL
25QMAKE_LIBS_THREAD = -lpthread
26
27QMAKE_MOC = $(OE_QMAKE_MOC)
28QMAKE_UIC = $(OE_QMAKE_UIC)
29QMAKE_UIC3 = $(OE_QMAKE_UIC3)
30QMAKE_RCC = $(OE_QMAKE_RCC)
31QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML)
32QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP)
33
34QMAKE_AR = $(OE_QMAKE_AR) cqs
35QMAKE_OBJCOPY = ${OBJCOPY}
36QMAKE_RANLIB =
37
38QMAKE_TAR = tar -cf
39QMAKE_GZIP = gzip -9f
40
41QMAKE_COPY = cp -f
42QMAKE_COPY_FILE = $(COPY)
43QMAKE_COPY_DIR = $(COPY) -r
44QMAKE_MOVE = mv -f
45QMAKE_DEL_FILE = rm -f
46QMAKE_DEL_DIR = rmdir
47QMAKE_STRIP = $(OE_QMAKE_STRIP)
48QMAKE_STRIPFLAGS_LIB += --strip-unneeded
49QMAKE_CHK_DIR_EXISTS = test -d
50QMAKE_MKDIR = mkdir -p
51QMAKE_INSTALL_FILE = install -m 644 -p
52QMAKE_INSTALL_PROGRAM = install -m 755 -p
53
54include(unix.conf)
diff --git a/meta-lsb/packages/qt4/qt4-x11-free.inc b/meta-lsb/packages/qt4/qt4-x11-free.inc
deleted file mode 100644
index 352df1e5a7..0000000000
--- a/meta-lsb/packages/qt4/qt4-x11-free.inc
+++ /dev/null
@@ -1,14 +0,0 @@
1require qt4.inc
2
3SECTION = "x11/libs"
4PRIORITY = "optional"
5DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
6
7QT_GLFLAGS ?= "-no-opengl"
8QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}"
9QT_BASE_NAME ?= "qt4"
10QT_BASE_LIB ?= "libqt"
11QT_DIR_NAME = "qt4"
12QT_LIBINFIX = ""
13
14inherit qmake2
diff --git a/meta-lsb/packages/qt4/qt4-x11-free_4.6.3.bb b/meta-lsb/packages/qt4/qt4-x11-free_4.6.3.bb
deleted file mode 100644
index e42f650c07..0000000000
--- a/meta-lsb/packages/qt4/qt4-x11-free_4.6.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require qt4-x11-free.inc
2require qt-4.6.3.inc
3
4PR = "r0"
5
6QT_CONFIG_FLAGS += " -xrandr "
diff --git a/meta-lsb/packages/qt4/qt4.inc b/meta-lsb/packages/qt4/qt4.inc
deleted file mode 100644
index 16d5bebd36..0000000000
--- a/meta-lsb/packages/qt4/qt4.inc
+++ /dev/null
@@ -1,300 +0,0 @@
1DESCRIPTION = "Qt is a comprehensive cross-platform C++ application framework"
2HOMEPAGE = "http://qt.nokia.com"
3
4DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3"
5
6inherit qmake_base
7
8QT_CONFIG_FLAGS += "-release -no-cups -no-accessibility -reduce-relocations \
9 -shared -no-nas-sound -no-sm -no-nis \
10 -qt-gif -system-libjpeg -system-libpng -system-zlib \
11 -no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite \
12 -no-pch -dbus -stl -glib -phonon -webkit"
13
14EXTRA_OEMAKE = "-e"
15
16EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \
17 INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
18 QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
19 AR="${TARGET_PREFIX}ar cqs" \
20 MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"'
21
22export QT_CONF_PATH="${WORKDIR}/qt.conf"
23
24# Library packages
25QT_LIB_NAMES = "Qt3Support QtAssistantClient QtCLucene QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtHelp QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtUiTools QtWebKit QtXml QtXmlPatterns phonon QtMultimedia QtOpenVG QtMediaServices"
26
27QT_EXTRA_LIBS = "pvrQWSWSEGL"
28
29python __anonymous () {
30 import bb
31
32 lib_packages = []
33 dev_packages = []
34 dbg_packages = []
35 for name in bb.data.getVar("QT_LIB_NAMES", d, 1).split():
36 pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "") + "4"
37 # NOTE: the headers for QtAssistantClient are different
38 incname = name.replace("QtAssistantClient", "QtAssistant")
39 bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d)
40 bb.data.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s${QT_LIBINFIX}.prl
41 ${libdir}/lib%(name)s${QT_LIBINFIX}.a
42 ${libdir}/lib%(name)s${QT_LIBINFIX}.la
43 ${libdir}/lib%(name)s${QT_LIBINFIX}.so
44 ${includedir}/${QT_DIR_NAME}/%(incname)s
45 ${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals(), d)
46 bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d)
47 lib_packages.append(pkg)
48 dev_packages.append("%s-dev" % pkg)
49 dbg_packages.append("%s-dbg" % pkg)
50 for name in bb.data.getVar("OTHER_PACKAGES", d, 1).split():
51 dbg_packages.append("%s-dbg" % name)
52
53 for name in bb.data.getVar("QT_EXTRA_LIBS", d, 1).split():
54 pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "") + "4"
55 bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals(), d)
56 bb.data.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl
57 ${libdir}/lib%(name)s.a
58 ${libdir}/lib%(name)s.la
59 ${libdir}/lib%(name)s.so
60 ${includedir}/${QT_DIR_NAME}/%(incname)s
61 ${libdir}/pkgconfig/%(name)s.pc""" % locals(), d)
62 bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s.so.*" % locals(), d)
63 lib_packages.append(pkg)
64 dev_packages.append("%s-dev" % pkg)
65 dbg_packages.append("%s-dbg" % pkg)
66
67 bb.data.setVar("LIB_PACKAGES", " ".join(lib_packages), d)
68 bb.data.setVar("DEV_PACKAGES", " ".join(dev_packages), d)
69 bb.data.setVar("DBG_PACKAGES", " ".join(dbg_packages), d)
70}
71
72OTHER_PACKAGES = "\
73 ${QT_BASE_NAME}-tools \
74 ${QT_BASE_NAME}-assistant \
75 ${QT_BASE_NAME}-common \
76 ${QT_BASE_NAME}-dbus \
77 ${QT_BASE_NAME}-demos \
78 ${QT_BASE_NAME}-designer \
79 ${QT_BASE_NAME}-examples \
80 ${QT_BASE_NAME}-fonts \
81 ${QT_BASE_NAME}-fonts-ttf-vera \
82 ${QT_BASE_NAME}-fonts-ttf-dejavu \
83 ${QT_BASE_NAME}-fonts-pfa \
84 ${QT_BASE_NAME}-fonts-pfb \
85 ${QT_BASE_NAME}-fonts-qpf \
86 ${QT_BASE_NAME}-linguist \
87 ${QT_BASE_NAME}-makeqpf \
88 ${QT_BASE_NAME}-mkspecs \
89 ${QT_BASE_NAME}-pixeltool \
90 ${QT_BASE_NAME}-qt3to4"
91
92PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}"
93PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-fonts-*"
94
95ALLOW_EMPTY_${PN} = "1"
96ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1"
97FILES_${PN} = ""
98FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*"
99FILES_${PN}-dbg = ""
100RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}"
101RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}"
102RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}"
103RRECOMMENDS_${QT_BASE_NAME}-fonts = " \
104 ${QT_BASE_NAME}-fonts-ttf-vera \
105 ${QT_BASE_NAME}-fonts-ttf-dejavu \
106 ${QT_BASE_NAME}-fonts-pfa \
107 ${QT_BASE_NAME}-fonts-pfb \
108 ${QT_BASE_NAME}-fonts-qpf"
109
110FILES_${QT_BASE_NAME}-tools = "${bindir}/uic* ${bindir}/moc ${bindir}/rcc ${bindir}/qttracereplay ${bindir}/qdoc*"
111FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator"
112FILES_${QT_BASE_NAME}-assistant-dbg = "${bindir}/.debug/*assistant* ${bindir}/.debug/qcollectiongenerator ${bindir}/.debug/qhelpconverter ${bindir}/.debug/qhelpgenerator"
113FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig"
114FILES_${QT_BASE_NAME}-common-dbg = "${bindir}/.debug/qtconfig"
115FILES_${QT_BASE_NAME}-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer"
116FILES_${QT_BASE_NAME}-dbus-dbg = "${bindir}/.debug/qdbus ${bindir}/.debug/qdbusxml2cpp ${bindir}/.debug/qdbuscpp2xml ${bindir}/.debug/qdbusviewer"
117FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/*"
118FILES_${QT_BASE_NAME}-demos-dbg = "${bindir}/.debug/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/.debug/* ${bindir}/${QT_DIR_NAME}/demos/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/*/.debug"
119FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*"
120FILES_${QT_BASE_NAME}-designer-dbg = "${bindir}/.debug/*designer*"
121FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_DIR_NAME}/examples/*"
122FILES_${QT_BASE_NAME}-examples-dbg = "${bindir}/${QT_DIR_NAME}/examples/.debug ${bindir}/${QT_DIR_NAME}/examples/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/*/.debug"
123FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf"
124FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf"
125FILES_${QT_BASE_NAME}-fonts-pfa = "${libdir}/fonts/*.pfa"
126FILES_${QT_BASE_NAME}-fonts-pfb = "${libdir}/fonts/*.pfb"
127FILES_${QT_BASE_NAME}-fonts-qpf = "${libdir}/fonts/*.qpf"
128FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/lconvert ${bindir}/qm2ts"
129FILES_${QT_BASE_NAME}-linguist-dbg = "${bindir}/.debug/*linguist* ${bindir}/.debug/lrelease ${bindir}/.debug/lupdate ${bindir}/.debug/lconvert ${bindir}/.debug/qm2ts"
130FILES_${QT_BASE_NAME}-pixeltool = "${bindir}/pixeltool"
131FILES_${QT_BASE_NAME}-pixeltool-dbg = "${bindir}/.debug/pixeltool"
132FILES_${QT_BASE_NAME}-qt3to4 = "${bindir}/qt3to4 ${datadir}/${QT_DIR_NAME}/q3porting.xml"
133FILES_${QT_BASE_NAME}-qt3to4-dbg = "${bindir}/.debug/qt3to4"
134FILES_${QT_BASE_NAME}-makeqpf = "${bindir}/makeqpf"
135FILES_${QT_BASE_NAME}-makeqpf-dbg = "${bindir}/.debug/makeqpf"
136FILES_${QT_BASE_NAME}-mkspecs = "${datadir}/${QT_DIR_NAME}/mkspecs/*"
137
138ARM_INSTRUCTION_SET = "arm"
139
140set_arch() {
141 case ${TARGET_ARCH} in
142 arm*) QT_ARCH=arm ;;
143 i*86*) QT_ARCH=i386 ;;
144 mips*) QT_ARCH=mips ;;
145 powerpc*) QT_ARCH=powerpc ;;
146 x86_64*) QT_ARCH=x86_64 ;;
147 esac
148}
149
150do_configure() {
151 unset QMAKESPEC
152 unset QTDIR
153
154 set_arch
155
156 if [ ! -e bin/qmake ]; then
157 ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
158 fi
159
160 if [ ! -e mkspecs/${TARGET_OS}-oe-g++ ]; then
161 ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++
162 fi
163
164 cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf mkspecs/common/
165
166 echo "[Paths]" > $QT_CONF_PATH
167 echo "Prefix=${prefix}/" >> $QT_CONF_PATH
168 echo "Documentation=${docdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
169 echo "Headers=${includedir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
170 echo "Libraries=${libdir}" >> $QT_CONF_PATH
171 echo "Binaries=${bindir}" >> $QT_CONF_PATH
172 echo "Plugins=${libdir}/${QT_DIR_NAME}/plugins" >> $QT_CONF_PATH
173 echo "Data=${datadir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
174 echo "Translations=${datadir}/${QT_DIR_NAME}/translations" >> $QT_CONF_PATH
175 echo "Settings=${sysconfdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
176 echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH
177 echo "Demos=${bindir}/${QT_DIR_NAME}/demos" >> $QT_CONF_PATH
178
179 ${EXTRA_QMAKE_MUNGE}|| true
180
181 (echo o; echo yes) | ./configure -v \
182 -prefix ${prefix}/ \
183 -bindir ${bindir} \
184 -libdir ${libdir} \
185 -datadir ${datadir}/${QT_DIR_NAME} \
186 -sysconfdir ${sysconfdir}/${QT_DIR_NAME} \
187 -docdir ${docdir}/${QT_DIR_NAME} \
188 -headerdir ${includedir}/${QT_DIR_NAME} \
189 -plugindir ${libdir}/${QT_DIR_NAME}/plugins \
190 -translationdir ${datadir}/${QT_DIR_NAME}/translations \
191 -examplesdir ${bindir}/${QT_DIR_NAME}/examples \
192 -demosdir ${bindir}/${QT_DIR_NAME}/demos \
193 -platform ${TARGET_OS}-oe-g++ \
194 -xplatform ${TARGET_OS}-oe-g++ \
195 -crossarch ${QT_ARCH} \
196 ${QT_CONFIG_FLAGS} -no-fast \
197 -L${STAGING_LIBDIR} -I${STAGING_INCDIR} \
198 -I${STAGING_INCDIR}/freetype2
199}
200
201do_compile() {
202 unset CFLAGS CXXFLAGS
203 install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
204 install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
205 install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
206
207 oe_runmake ${EXTRA_ENV}
208}
209
210python populate_packages_prepend() {
211 translation_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d)
212 translation_name = bb.data.expand('${QT_BASE_NAME}-translation-%s', d)
213 do_split_packages(d, translation_dir, '^(assistant|designer|linguist|qt|qtconfig|qvfb)_(.*)\.qm$', translation_name, '${PN} translation for %s', extra_depends='' )
214
215 phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
216 phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d)
217 do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
218
219 # Package all the plugins and their -dbg version and create a meta package
220 import os
221 def qtopia_split(path, name, glob):
222 """
223 Split the package into a normal and -dbg package and then add the
224 new packages to the meta package.
225 """
226 plugin_dir = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/' % path, d)
227 if not os.path.exists("%s%s" % (bb.data.expand('${D}',d), plugin_dir)):
228 bb.note("The path does not exist:", bb.data.expand('${D}', d), plugin_dir)
229 return
230
231 plugin_name = bb.data.expand('${QT_BASE_NAME}-plugin-%s-%%s' % name, d)
232 dev_packages = []
233 dev_hook = lambda file,pkg,b,c,d:dev_packages.append((file,pkg))
234 do_split_packages(d, plugin_dir, glob, plugin_name, '${PN} %s for %%s' % name, extra_depends='', hook=dev_hook)
235 # Create a -dbg package as well
236 plugin_dir_dbg = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug' % path, d)
237 packages = bb.data.getVar('PACKAGES',d)
238 for (file,package) in dev_packages:
239 packages = "%s %s-dbg" % (packages, package)
240 file_name = os.path.join(plugin_dir_dbg, os.path.basename(file))
241 bb.data.setVar("FILES_%s-dbg" % package, file_name, d)
242 bb.data.setVar("DESCRIPTION_%s-dbg" % package, "${PN} %s for %s" % (name, package), d)
243
244 bb.data.setVar('PACKAGES', packages, d)
245
246 qtopia_split('accessible', 'accessible', '^libq(.*)\.so$')
247 qtopia_split('codecs', 'codec', '^libq(.*)\.so$')
248 qtopia_split('decorations', 'decoration', '^libqdecoration(.*)\.so$')
249 qtopia_split('designer', 'designer', '^lib(.*)\.so$')
250 qtopia_split('gfxdrivers', 'gfxdriver', '^libq(.*)\.so$')
251 qtopia_split('graphicssystems','graphicssystems', '^libq(.*)\.so$')
252 qtopia_split('mousedrivers', 'mousedriver', '^libq(.*)mousedriver\.so$')
253 qtopia_split('iconengines', 'iconengine', '^libq(.*)\.so$')
254 qtopia_split('imageformats', 'imageformat', '^libq(.*)\.so$')
255 qtopia_split('inputmethods', 'inputmethod', '^libq(.*)\.so$')
256 qtopia_split('sqldrivers', 'sqldriver', '^libq(.*)\.so$')
257 qtopia_split('script', 'script', '^libqtscript(.*)\.so$')
258 qtopia_split('styles', 'style', '^libq(.*)\.so$')
259 qtopia_split('phonon_backend','phonon-backend','^libphonon_(.*)\.so$')
260}
261
262do_install() {
263 oe_runmake install INSTALL_ROOT=${D}
264
265 # These are host binaries, we should only use them in staging
266 rm -rf ${D}/${bindir}/qmake
267
268 # fix pkgconfig, libtool and prl files
269 sed -i -e s#-L${S}/lib##g \
270 -e s#-L${STAGING_LIBDIR}##g \
271 -e 's#STAGING_LIBDIR}#libdir}'#g \
272 -e s#-L${libdir}##g \
273 -e s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \
274 -e s#" -Wl,-rpath-link,${S}/lib"##g \
275 -e s#" -Wl,-rpath-link,${libdir}"##g \
276 -e 's#I/usr/include#Iincludedir}#g' \
277 -e 's#Iin#I${in#g' \
278 ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
279
280 sed -i -e s#" -Wl,-rpath-link,${S}/lib"##g \
281 ${D}${datadir}/${QT_DIR_NAME}/mkspecs/common/linux.conf
282
283 # fix pkgconfig files
284 sed -i -e s#"moc_location=.*$"#"moc_location=${bindir}/moc4"# \
285 -e s#"uic_location=.*$"#"uic_location=${bindir}/uic4"# \
286 ${D}${libdir}/pkgconfig/*.pc
287 for name in ${QT_LIB_NAMES}; do
288 sed -i -e /Requires/s#"${name}"#"${name}${QT_LIBINFIX}"#g ${D}${libdir}/pkgconfig/*.pc
289 done
290
291 # QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so manually fix it up here:
292 for pc in ${D}${libdir}/pkgconfig/*.pc ; do
293 sed -i -e "s:prefix}include/${QT_BASE_NAME}/$(basename $pc .pc):prefix}/include:" \
294 -e "s,Cflags: ,Cflags: -IP{includedir}/${QT_BASE_NAME}/$(basename $pc .pc) ," \
295 -e 's:IP{:I${:g' $pc
296 done
297
298 install -d ${D}/${libdir}/fonts
299 touch ${D}/${libdir}/fonts/fontdir
300}
diff --git a/meta-lsb/packages/quota/quota_3.17.bb b/meta-lsb/packages/quota/quota_3.17.bb
deleted file mode 100644
index 495e3072ce..0000000000
--- a/meta-lsb/packages/quota/quota_3.17.bb
+++ /dev/null
@@ -1,19 +0,0 @@
1DESCRIPTION = "display disk usage and limits"
2SECTION = "base"
3HOMEPAGE = "http://sourceforge.net/projects/linuxquota/"
4BUGTRACKER = "http://sourceforge.net/tracker/?group_id=18136&atid=118136"
5LICENSE = "BSD & GPLv2+ & LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://quota.c;beginline=1;endline=33;md5=331c7d77744bfe0ad24027f0651028ec \
7 file://rquota_server.c;beginline=1;endline=20;md5=91cf52a9aa19e13c2797bd2bf785d7c4 \
8 file://svc_socket.c;beginline=1;endline=17;md5=24d5a8792da45910786eeac750be8ceb"
9PR = "r0"
10
11SRC_URI = "http://downloads.sourceforge.net/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz"
12
13S = ${WORKDIR}/quota-tools
14
15inherit autotools
16
17do_install() {
18 oe_runmake prefix=${D}${prefix} install
19}
diff --git a/meta-lsb/packages/shadow/shadow-4.1.4.2/login_defs_pam.sed b/meta-lsb/packages/shadow/shadow-4.1.4.2/login_defs_pam.sed
deleted file mode 100644
index 0a1f3be4af..0000000000
--- a/meta-lsb/packages/shadow/shadow-4.1.4.2/login_defs_pam.sed
+++ /dev/null
@@ -1,32 +0,0 @@
1/^FAILLOG_ENAB/b comment
2/^LASTLOG_ENAB/b comment
3/^MAIL_CHECK_ENAB/b comment
4/^OBSCURE_CHECKS_ENAB/b comment
5/^PORTTIME_CHECKS_ENAB/b comment
6/^QUOTAS_ENAB/b comment
7/^MOTD_FILE/b comment
8/^FTMP_FILE/b comment
9/^NOLOGINS_FILE/b comment
10/^ENV_HZ/b comment
11/^ENV_TZ/b comment
12/^PASS_MIN_LEN/b comment
13/^SU_WHEEL_ONLY/b comment
14/^CRACKLIB_DICTPATH/b comment
15/^PASS_CHANGE_TRIES/b comment
16/^PASS_ALWAYS_WARN/b comment
17/^PASS_MAX_LEN/b comment
18/^PASS_MIN_LEN/b comment
19/^CHFN_AUTH/b comment
20/^CHSH_AUTH/b comment
21/^ISSUE_FILE/b comment
22/^LOGIN_STRING/b comment
23/^ULIMIT/b comment
24/^ENVIRON_FILE/b comment
25
26b exit
27
28: comment
29 s:^:#:
30
31: exit
32
diff --git a/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/chfn b/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/chfn
deleted file mode 100644
index baf7698bba..0000000000
--- a/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/chfn
+++ /dev/null
@@ -1,14 +0,0 @@
1#
2# The PAM configuration file for the Shadow `chfn' service
3#
4
5# This allows root to change user infomation without being
6# prompted for a password
7auth sufficient pam_rootok.so
8
9# The standard Unix authentication modules, used with
10# NIS (man nsswitch) as well as normal /etc/passwd and
11# /etc/shadow entries.
12auth include common-auth
13account include common-account
14session include common-session
diff --git a/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/chpasswd b/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/chpasswd
deleted file mode 100644
index 9e3efa68ba..0000000000
--- a/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/chpasswd
+++ /dev/null
@@ -1,4 +0,0 @@
1# The PAM configuration file for the Shadow 'chpasswd' service
2#
3
4password include common-password
diff --git a/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/chsh b/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/chsh
deleted file mode 100644
index 8fb169f64e..0000000000
--- a/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/chsh
+++ /dev/null
@@ -1,19 +0,0 @@
1#
2# The PAM configuration file for the Shadow `chsh' service
3#
4
5# This will not allow a user to change their shell unless
6# their current one is listed in /etc/shells. This keeps
7# accounts with special shells from changing them.
8auth required pam_shells.so
9
10# This allows root to change user shell without being
11# prompted for a password
12auth sufficient pam_rootok.so
13
14# The standard Unix authentication modules, used with
15# NIS (man nsswitch) as well as normal /etc/passwd and
16# /etc/shadow entries.
17auth include common-auth
18account include common-account
19session include common-session
diff --git a/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/login b/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/login
deleted file mode 100644
index e41eb04ec1..0000000000
--- a/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/login
+++ /dev/null
@@ -1,91 +0,0 @@
1#
2# The PAM configuration file for the Shadow `login' service
3#
4
5# Enforce a minimal delay in case of failure (in microseconds).
6# (Replaces the `FAIL_DELAY' setting from login.defs)
7# Note that other modules may require another minimal delay. (for example,
8# to disable any delay, you should add the nodelay option to pam_unix)
9auth optional pam_faildelay.so delay=3000000
10
11# Outputs an issue file prior to each login prompt (Replaces the
12# ISSUE_FILE option from login.defs). Uncomment for use
13# auth required pam_issue.so issue=/etc/issue
14
15# Disallows root logins except on tty's listed in /etc/securetty
16# (Replaces the `CONSOLE' setting from login.defs)
17# Note that it is included as a "requisite" module. No password prompts will
18# be displayed if this module fails to avoid having the root password
19# transmitted on unsecure ttys.
20# You can change it to a "required" module if you think it permits to
21# guess valid user names of your system (invalid user names are considered
22# as possibly being root).
23auth [success=ok ignore=ignore user_unknown=ignore default=die] pam_securetty.so
24
25# Disallows other than root logins when /etc/nologin exists
26# (Replaces the `NOLOGINS_FILE' option from login.defs)
27auth requisite pam_nologin.so
28
29# SELinux needs to be the first session rule. This ensures that any
30# lingering context has been cleared. Without out this it is possible
31# that a module could execute code in the wrong domain.
32# When the module is present, "required" would be sufficient (When SELinux
33# is disabled, this returns success.)
34session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
35
36# This module parses environment configuration file(s)
37# and also allows you to use an extended config
38# file /etc/security/pam_env.conf.
39#
40# parsing /etc/environment needs "readenv=1"
41session required pam_env.so readenv=1
42# locale variables are also kept into /etc/default/locale in etch
43# reading this file *in addition to /etc/environment* does not hurt
44session required pam_env.so readenv=1 envfile=/etc/default/locale
45
46# Standard Un*x authentication.
47auth include common-auth
48
49# This allows certain extra groups to be granted to a user
50# based on things like time of day, tty, service, and user.
51# Please edit /etc/security/group.conf to fit your needs
52# (Replaces the `CONSOLE_GROUPS' option in login.defs)
53auth optional pam_group.so
54
55# Uncomment and edit /etc/security/time.conf if you need to set
56# time restrainst on logins.
57# (Replaces the `PORTTIME_CHECKS_ENAB' option from login.defs
58# as well as /etc/porttime)
59# account requisite pam_time.so
60
61# Uncomment and edit /etc/security/access.conf if you need to
62# set access limits.
63# (Replaces /etc/login.access file)
64# account required pam_access.so
65
66# Sets up user limits according to /etc/security/limits.conf
67# (Replaces the use of /etc/limits in old login)
68session required pam_limits.so
69
70# Prints the last login info upon succesful login
71# (Replaces the `LASTLOG_ENAB' option from login.defs)
72session optional pam_lastlog.so
73
74# Prints the motd upon succesful login
75# (Replaces the `MOTD_FILE' option in login.defs)
76session optional pam_motd.so
77
78# Prints the status of the user's mailbox upon succesful login
79# (Replaces the `MAIL_CHECK_ENAB' option from login.defs).
80#
81# This also defines the MAIL environment variable
82# However, userdel also needs MAIL_DIR and MAIL_FILE variables
83# in /etc/login.defs to make sure that removing a user
84# also removes the user's mail spool file.
85# See comments in /etc/login.defs
86session optional pam_mail.so standard
87
88# Standard Un*x account and session
89account include common-account
90password include common-password
91session include common-session
diff --git a/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/newusers b/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/newusers
deleted file mode 100644
index 4aa3dde48b..0000000000
--- a/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/newusers
+++ /dev/null
@@ -1,4 +0,0 @@
1# The PAM configuration file for the Shadow 'newusers' service
2#
3
4password include common-password
diff --git a/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/passwd b/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/passwd
deleted file mode 100644
index f534992435..0000000000
--- a/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/passwd
+++ /dev/null
@@ -1,5 +0,0 @@
1#
2# The PAM configuration file for the Shadow `passwd' service
3#
4
5password include common-password
diff --git a/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/su b/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/su
deleted file mode 100644
index 8e35137f37..0000000000
--- a/meta-lsb/packages/shadow/shadow-4.1.4.2/pam.d/su
+++ /dev/null
@@ -1,60 +0,0 @@
1#
2# The PAM configuration file for the Shadow `su' service
3#
4
5# This allows root to su without passwords (normal operation)
6auth sufficient pam_rootok.so
7
8# Uncomment this to force users to be a member of group root
9# before they can use `su'. You can also add "group=foo"
10# to the end of this line if you want to use a group other
11# than the default "root" (but this may have side effect of
12# denying "root" user, unless she's a member of "foo" or explicitly
13# permitted earlier by e.g. "sufficient pam_rootok.so").
14# (Replaces the `SU_WHEEL_ONLY' option from login.defs)
15# auth required pam_wheel.so
16
17# Uncomment this if you want wheel members to be able to
18# su without a password.
19# auth sufficient pam_wheel.so trust
20
21# Uncomment this if you want members of a specific group to not
22# be allowed to use su at all.
23# auth required pam_wheel.so deny group=nosu
24
25# Uncomment and edit /etc/security/time.conf if you need to set
26# time restrainst on su usage.
27# (Replaces the `PORTTIME_CHECKS_ENAB' option from login.defs
28# as well as /etc/porttime)
29# account requisite pam_time.so
30
31# This module parses environment configuration file(s)
32# and also allows you to use an extended config
33# file /etc/security/pam_env.conf.
34#
35# parsing /etc/environment needs "readenv=1"
36session required pam_env.so readenv=1
37# locale variables are also kept into /etc/default/locale in etch
38# reading this file *in addition to /etc/environment* does not hurt
39session required pam_env.so readenv=1 envfile=/etc/default/locale
40
41# Defines the MAIL environment variable
42# However, userdel also needs MAIL_DIR and MAIL_FILE variables
43# in /etc/login.defs to make sure that removing a user
44# also removes the user's mail spool file.
45# See comments in /etc/login.defs
46#
47# "nopen" stands to avoid reporting new mail when su'ing to another user
48session optional pam_mail.so nopen
49
50# Sets up user limits, please uncomment and read /etc/security/limits.conf
51# to enable this functionality.
52# (Replaces the use of /etc/limits in old login)
53# session required pam_limits.so
54
55# The standard Unix authentication modules, used with
56# NIS (man nsswitch) as well as normal /etc/passwd and
57# /etc/shadow entries.
58auth include common-auth
59account include common-account
60session include common-session
diff --git a/meta-lsb/packages/shadow/shadow-4.1.4.2/securetty b/meta-lsb/packages/shadow/shadow-4.1.4.2/securetty
deleted file mode 100644
index 28fa0afb72..0000000000
--- a/meta-lsb/packages/shadow/shadow-4.1.4.2/securetty
+++ /dev/null
@@ -1,206 +0,0 @@
1# /etc/securetty: list of terminals on which root is allowed to login.
2# See securetty(5) and login(1).
3console
4
5# Standard serial ports
6ttyS0
7ttyS1
8ttyS2
9ttyS3
10
11# Samsung ARM SoCs
12ttySAC0
13ttySAC1
14ttySAC2
15ttySAC3
16
17# TI OMAP SoCs
18ttyO0
19ttyO1
20ttyO2
21ttyO3
22
23# USB dongles
24ttyUSB0
25ttyUSB1
26ttyUSB2
27
28# PowerMac
29ttyPZ0
30ttyPZ1
31ttyPZ2
32ttyPZ3
33
34# Embedded MPC platforms
35ttyPSC0
36ttyPSC1
37ttyPSC2
38ttyPSC3
39ttyPSC4
40ttyPSC5
41
42# PA-RISC mux ports
43ttyB0
44ttyB1
45
46# Standard hypervisor virtual console
47hvc0
48
49# Oldstyle Xen console
50xvc0
51
52# Standard consoles
53tty1
54tty2
55tty3
56tty4
57tty5
58tty6
59tty7
60tty8
61tty9
62tty10
63tty11
64tty12
65tty13
66tty14
67tty15
68tty16
69tty17
70tty18
71tty19
72tty20
73tty21
74tty22
75tty23
76tty24
77tty25
78tty26
79tty27
80tty28
81tty29
82tty30
83tty31
84tty32
85tty33
86tty34
87tty35
88tty36
89tty37
90tty38
91tty39
92tty40
93tty41
94tty42
95tty43
96tty44
97tty45
98tty46
99tty47
100tty48
101tty49
102tty50
103tty51
104tty52
105tty53
106tty54
107tty55
108tty56
109tty57
110tty58
111tty59
112tty60
113tty61
114tty62
115tty63
116
117# Local X displays (allows empty passwords with pam_unix's nullok_secure)
118:0
119:0.0
120:0.1
121:1
122:1.0
123:1.1
124:2
125:2.0
126:2.1
127:3
128:3.0
129:3.1
130
131# Embedded Freescale i.MX ports
132ttymxc0
133ttymxc1
134ttymxc2
135ttymxc3
136ttymxc4
137ttymxc5
138
139# Standard serial ports, with devfs
140tts/0
141tts/1
142
143# Standard consoles, with devfs
144vc/1
145vc/2
146vc/3
147vc/4
148vc/5
149vc/6
150vc/7
151vc/8
152vc/9
153vc/10
154vc/11
155vc/12
156vc/13
157vc/14
158vc/15
159vc/16
160vc/17
161vc/18
162vc/19
163vc/20
164vc/21
165vc/22
166vc/23
167vc/24
168vc/25
169vc/26
170vc/27
171vc/28
172vc/29
173vc/30
174vc/31
175vc/32
176vc/33
177vc/34
178vc/35
179vc/36
180vc/37
181vc/38
182vc/39
183vc/40
184vc/41
185vc/42
186vc/43
187vc/44
188vc/45
189vc/46
190vc/47
191vc/48
192vc/49
193vc/50
194vc/51
195vc/52
196vc/53
197vc/54
198vc/55
199vc/56
200vc/57
201vc/58
202vc/59
203vc/60
204vc/61
205vc/62
206vc/63
diff --git a/meta-lsb/packages/shadow/shadow-4.1.4.2/shadow-4.1.3-dots-in-usernames.patch b/meta-lsb/packages/shadow/shadow-4.1.4.2/shadow-4.1.3-dots-in-usernames.patch
deleted file mode 100644
index 7a2ff2e24e..0000000000
--- a/meta-lsb/packages/shadow/shadow-4.1.4.2/shadow-4.1.3-dots-in-usernames.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1# commit message copied from openembedded:
2# commit 246c80637b135f3a113d319b163422f98174ee6c
3# Author: Khem Raj <raj.khem@gmail.com>
4# Date: Wed Jun 9 13:37:03 2010 -0700
5#
6# shadow-4.1.4.2: Add patches to support dots in login id.
7#
8# Signed-off-by: Khem Raj <raj.khem@gmail.com>
9#
10# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-08-11
11
12Index: shadow-4.1.4.2/libmisc/chkname.c
13===================================================================
14--- shadow-4.1.4.2.orig/libmisc/chkname.c 2009-04-28 12:14:04.000000000 -0700
15+++ shadow-4.1.4.2/libmisc/chkname.c 2010-06-03 17:43:20.638973857 -0700
16@@ -61,6 +61,7 @@ static bool is_valid_name (const char *n
17 ( ('0' <= *name) && ('9' >= *name) ) ||
18 ('_' == *name) ||
19 ('-' == *name) ||
20+ ('.' == *name) ||
21 ( ('$' == *name) && ('\0' == *(name + 1)) )
22 )) {
23 return false;
diff --git a/meta-lsb/packages/shadow/shadow-4.1.4.2/shadow-4.1.4.2-env-reset-keep-locale.patch b/meta-lsb/packages/shadow/shadow-4.1.4.2/shadow-4.1.4.2-env-reset-keep-locale.patch
deleted file mode 100644
index 124065c7f9..0000000000
--- a/meta-lsb/packages/shadow/shadow-4.1.4.2/shadow-4.1.4.2-env-reset-keep-locale.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1# commit message copied from openembedded:
2# commit 246c80637b135f3a113d319b163422f98174ee6c
3# Author: Khem Raj <raj.khem@gmail.com>
4# Date: Wed Jun 9 13:37:03 2010 -0700
5#
6# shadow-4.1.4.2: Add patches to support dots in login id.
7#
8# Signed-off-by: Khem Raj <raj.khem@gmail.com>
9#
10# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-08-11
11
12http://bugs.gentoo.org/283725
13https://alioth.debian.org/tracker/index.php?func=detail&aid=311740&group_id=30580&atid=411480
14
15Index: shadow-4.1.4.2/libmisc/env.c
16===================================================================
17--- shadow-4.1.4.2.orig/libmisc/env.c 2009-04-27 13:07:56.000000000 -0700
18+++ shadow-4.1.4.2/libmisc/env.c 2010-06-03 17:44:51.456408474 -0700
19@@ -251,7 +251,7 @@ void sanitize_env (void)
20 if (strncmp (*cur, *bad, strlen (*bad)) != 0) {
21 continue;
22 }
23- if (strchr (*cur, '/') != NULL) {
24+ if (strchr (*cur, '/') == NULL) {
25 continue; /* OK */
26 }
27 for (move = cur; NULL != *move; move++) {
diff --git a/meta-lsb/packages/shadow/shadow-4.1.4.2/shadow-4.1.4.2-groupmod-pam-check.patch b/meta-lsb/packages/shadow/shadow-4.1.4.2/shadow-4.1.4.2-groupmod-pam-check.patch
deleted file mode 100644
index 6682fe8078..0000000000
--- a/meta-lsb/packages/shadow/shadow-4.1.4.2/shadow-4.1.4.2-groupmod-pam-check.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1# commit message copied from openembedded:
2# commit 246c80637b135f3a113d319b163422f98174ee6c
3# Author: Khem Raj <raj.khem@gmail.com>
4# Date: Wed Jun 9 13:37:03 2010 -0700
5#
6# shadow-4.1.4.2: Add patches to support dots in login id.
7#
8# Signed-off-by: Khem Raj <raj.khem@gmail.com>
9#
10# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-08-11
11
12http://bugs.gentoo.org/300790
13http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2009-November/007850.html
14
152009-11-05 Nicolas François <nicolas.francois@centraliens.net>
16
17 * NEWS, src/groupmod.c: Fixed groupmod when configured with
18 --enable-account-tools-setuid.
19
20Index: shadow-4.1.4.2/src/groupmod.c
21===================================================================
22--- shadow-4.1.4.2.orig/src/groupmod.c 2009-06-05 15:16:58.000000000 -0700
23+++ shadow-4.1.4.2/src/groupmod.c 2010-06-03 17:45:43.828952613 -0700
24@@ -720,7 +720,7 @@ int main (int argc, char **argv)
25 {
26 struct passwd *pampw;
27 pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */
28- if (NULL == pamh) {
29+ if (NULL == pampw) {
30 fprintf (stderr,
31 _("%s: Cannot determine your user name.\n"),
32 Prog);
diff --git a/meta-lsb/packages/shadow/shadow-4.1.4.2/shadow-4.1.4.2-su_no_sanitize_env.patch b/meta-lsb/packages/shadow/shadow-4.1.4.2/shadow-4.1.4.2-su_no_sanitize_env.patch
deleted file mode 100644
index f67251c840..0000000000
--- a/meta-lsb/packages/shadow/shadow-4.1.4.2/shadow-4.1.4.2-su_no_sanitize_env.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1# commit message copied from openembedded:
2# commit 246c80637b135f3a113d319b163422f98174ee6c
3# Author: Khem Raj <raj.khem@gmail.com>
4# Date: Wed Jun 9 13:37:03 2010 -0700
5#
6# shadow-4.1.4.2: Add patches to support dots in login id.
7#
8# Signed-off-by: Khem Raj <raj.khem@gmail.com>
9#
10# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-08-11
11
12http://bugs.gentoo.org/show_bug.cgi?id=301957
13https://alioth.debian.org/scm/browser.php?group_id=30580
14
15Index: shadow-4.1.4.2/src/su.c
16===================================================================
17--- shadow-4.1.4.2.orig/src/su.c 2009-07-23 13:38:56.000000000 -0700
18+++ shadow-4.1.4.2/src/su.c 2010-06-03 17:46:47.718944010 -0700
19@@ -378,7 +378,7 @@ int main (int argc, char **argv)
20 #endif
21 #endif /* !USE_PAM */
22
23- sanitize_env ();
24+ /* sanitize_env (); */
25
26 (void) setlocale (LC_ALL, "");
27 (void) bindtextdomain (PACKAGE, LOCALEDIR);
diff --git a/meta-lsb/packages/shadow/shadow-4.1.4.2/shadow.automake-1.11.patch b/meta-lsb/packages/shadow/shadow-4.1.4.2/shadow.automake-1.11.patch
deleted file mode 100644
index 36d7be6fd0..0000000000
--- a/meta-lsb/packages/shadow/shadow-4.1.4.2/shadow.automake-1.11.patch
+++ /dev/null
@@ -1,102 +0,0 @@
1# patch is from openembedded:
2# commit 2db61370333f7a2fc1dbb86385734883387e0217
3# Author: Martin Jansa <Martin.Jansa@gmail.com>
4# Date: Fri Apr 2 07:34:46 2010 +0200
5#
6# shadow: fix do_install with automake-1.11
7#
8# Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9#
10# comment added by Kevin Tian <kevin.tian@intel.com>
11
12man_nopan is for !USE_PAM already included in man_MANS and automake-1.11 hates to install some file twice
13
14diff -uNr shadow-4.1.4.2.orig/man/Makefile.am shadow-4.1.4.2/man/Makefile.am
15--- shadow-4.1.4.2.orig/man/Makefile.am 2009-03-14 15:40:10.000000000 +0100
16+++ shadow-4.1.4.2/man/Makefile.am 2010-04-02 07:31:17.000000000 +0200
17@@ -163,7 +163,6 @@
18 $(man_MANS) \
19 $(man_XMANS) \
20 $(addprefix login.defs.d/,$(login_defs_v)) \
21- $(man_nopam) \
22 id.1 \
23 id.1.xml \
24 sulogin.8 \
25diff -uNr shadow-4.1.4.2.orig/man/fr/Makefile.am shadow-4.1.4.2/man/fr/Makefile.am
26--- shadow-4.1.4.2.orig/man/fr/Makefile.am 2008-09-06 18:44:45.000000000 +0200
27+++ shadow-4.1.4.2/man/fr/Makefile.am 2010-04-02 07:42:11.000000000 +0200
28@@ -52,7 +52,6 @@
29
30 EXTRA_DIST = \
31 $(man_MANS) \
32- $(man_nopam) \
33 id.1
34
35 include ../generate_translations.mak
36diff -uNr shadow-4.1.4.2.orig/man/it/Makefile.am shadow-4.1.4.2/man/it/Makefile.am
37--- shadow-4.1.4.2.orig/man/it/Makefile.am 2008-09-06 18:44:45.000000000 +0200
38+++ shadow-4.1.4.2/man/it/Makefile.am 2010-04-02 07:42:20.000000000 +0200
39@@ -46,7 +46,6 @@
40
41 EXTRA_DIST = \
42 $(man_MANS) \
43- $(man_nopam) \
44 id.1 \
45 logoutd.8
46
47diff -uNr shadow-4.1.4.2.orig/man/ja/Makefile.am shadow-4.1.4.2/man/ja/Makefile.am
48--- shadow-4.1.4.2.orig/man/ja/Makefile.am 2007-12-31 17:48:28.000000000 +0100
49+++ shadow-4.1.4.2/man/ja/Makefile.am 2010-04-02 07:42:17.000000000 +0200
50@@ -49,7 +49,6 @@
51
52 EXTRA_DIST = \
53 $(man_MANS) \
54- $(man_nopam) \
55 id.1 \
56 shadow.3 \
57 sulogin.8
58diff -uNr shadow-4.1.4.2.orig/man/pl/Makefile.am shadow-4.1.4.2/man/pl/Makefile.am
59--- shadow-4.1.4.2.orig/man/pl/Makefile.am 2008-09-06 18:44:45.000000000 +0200
60+++ shadow-4.1.4.2/man/pl/Makefile.am 2010-04-02 07:42:07.000000000 +0200
61@@ -49,7 +49,6 @@
62
63 EXTRA_DIST = \
64 $(man_MANS) \
65- $(man_nopam) \
66 getspnam.3 \
67 id.1 \
68 shadow.3 \
69diff -uNr shadow-4.1.4.2.orig/man/ru/Makefile.am shadow-4.1.4.2/man/ru/Makefile.am
70--- shadow-4.1.4.2.orig/man/ru/Makefile.am 2010-04-02 07:39:00.000000000 +0200
71+++ shadow-4.1.4.2/man/ru/Makefile.am 2010-04-02 07:42:01.000000000 +0200
72@@ -54,7 +54,6 @@
73
74 EXTRA_DIST = \
75 $(man_MANS) \
76- $(man_nopam) \
77 id.1 \
78 sulogin.8
79
80diff -uNr shadow-4.1.4.2.orig/man/sv/Makefile.am shadow-4.1.4.2/man/sv/Makefile.am
81--- shadow-4.1.4.2.orig/man/sv/Makefile.am 2008-09-06 18:44:45.000000000 +0200
82+++ shadow-4.1.4.2/man/sv/Makefile.am 2010-04-02 07:42:24.000000000 +0200
83@@ -53,8 +53,7 @@
84 endif
85
86 EXTRA_DIST = \
87- $(man_MANS) \
88- $(man_nopam)
89+ $(man_MANS)
90
91 include ../generate_translations.mak
92
93--- shadow-4.1.4.2.orig/man/ru/Makefile.am 2010-04-02 07:54:09.000000000 +0200
94+++ shadow-4.1.4.2/man/ru/Makefile.am 2010-04-02 07:51:57.000000000 +0200
95@@ -1,7 +1,6 @@
96 mandir = @mandir@/ru
97
98 man_MANS = \
99- $(man_nopam) \
100 chage.1 \
101 chfn.1 \
102 chgpasswd.8 \
diff --git a/meta-lsb/packages/shadow/shadow.inc b/meta-lsb/packages/shadow/shadow.inc
deleted file mode 100644
index fcbcb3eb75..0000000000
--- a/meta-lsb/packages/shadow/shadow.inc
+++ /dev/null
@@ -1,121 +0,0 @@
1DESCRIPTION = "Tools to change and administer password and group data."
2HOMEPAGE = "http://pkg-shadow.alioth.debian.org/"
3BUGTRACKER = "https://alioth.debian.org/tracker/?group_id=30580"
4SECTION = "base utils"
5LICENSE = "BSD | Artistic"
6LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
7 file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe"
8
9PAM_PLUGINS = " libpam-runtime \
10 pam-plugin-faildelay \
11 pam-plugin-securetty \
12 pam-plugin-nologin \
13 pam-plugin-env \
14 pam-plugin-group \
15 pam-plugin-limits \
16 pam-plugin-lastlog \
17 pam-plugin-motd \
18 pam-plugin-mail \
19 pam-plugin-shells \
20 pam-plugin-rootok"
21
22DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
23RDEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}"
24
25# since we deduce from ${SERIAL_CONSOLE}
26PACKAGE_ARCH = "${MACHINE_ARCH}"
27
28# Additional Policy files for PAM
29PAM_SRC_URI = "file://pam.d/chfn \
30 file://pam.d/chpasswd \
31 file://pam.d/chsh \
32 file://pam.d/login \
33 file://pam.d/newusers \
34 file://pam.d/passwd \
35 file://pam.d/su"
36
37SRC_URI = "ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-${PV}.tar.bz2 \
38 file://login_defs_pam.sed \
39 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
40 file://securetty"
41
42inherit autotools gettext
43
44EXTRA_OECONF += "--without-audit \
45 --without-libcrack \
46 ${@base_contains('DISTRO_FEATURES', 'pam', '--with-libpam', '--without-libpam', d)} \
47 --without-selinux"
48
49do_install_append() {
50 # Ensure that the image has as /var/spool/mail dir so shadow can put mailboxes there if the user
51 # reconfigures Shadow to default (see sed below).
52 install -d ${D}${localstatedir}/spool/mail
53
54 if [ -e ${WORKDIR}/pam.d ]; then
55 install -d ${D}${sysconfdir}/pam.d/
56 install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/
57 # Remove defaults that are not used when supporting PAM
58 sed -i -f ${WORKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs
59 fi
60
61 # Enable CREATE_HOME by default.
62 sed -i 's/#CREATE_HOME/CREATE_HOME/g' ${D}${sysconfdir}/login.defs
63
64 # As we are on an embedded system ensure the users mailbox is in ~/ not
65 # /var/spool/mail by default as who knows where or how big /var is.
66 # The system MDA will set this later anyway.
67 sed -i 's/MAIL_DIR/#MAIL_DIR/g' ${D}${sysconfdir}/login.defs
68 sed -i 's/#MAIL_FILE/MAIL_FILE/g' ${D}${sysconfdir}/login.defs
69
70 # disable checking emails at all
71 sed -i 's/MAIL_CHECK_ENAB/#MAIL_CHECK_ENAB/g' ${D}${sysconfdir}/login.defs
72
73 # now we don't have a mail system. disable mail creation for now
74 sed -i 's:/bin/bash:/bin/sh:g' ${D}${sysconfdir}/default/useradd
75 sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd
76
77 install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir}
78 for i in passwd chfn newgrp chsh ; do
79 mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}
80 done
81
82 mv ${D}${sbindir}/chpasswd ${D}${sbindir}/chpasswd.${PN}
83 mv ${D}${sbindir}/vigr ${D}${base_sbindir}/vigr.${PN}
84 mv ${D}${sbindir}/vipw ${D}${base_sbindir}/vipw.${PN}
85 mv ${D}${bindir}/login ${D}${base_bindir}/login.${PN}
86
87 # Ensure we add a suitable securetty file to the package that has most common embedded TTYs defined.
88 if [ ! -z "${SERIAL_CONSOLE}" ]; then
89 # our SERIAL_CONSOLE contains baud rate too and sometime -L option as well.
90 # the following pearl :) takes that and converts it into newline sepated tty's and appends
91 # them into securetty. So if a machine has a weird looking console device node (e.g. ttyAMA0) that securetty
92 # does not know then it will get appended to securetty and root login will be allowed on
93 # that console.
94 echo "${SERIAL_CONSOLE}" | sed -e 's/[0-9][0-9]\|\-L//g'|tr "[ ]" "[\n]" >> ${WORKDIR}/securetty
95 fi
96 install -m 0400 ${WORKDIR}/securetty ${D}${sysconfdir}/securetty
97}
98
99pkg_postinst_${PN} () {
100 update-alternatives --install ${bindir}/passwd passwd passwd.${PN} 200
101 update-alternatives --install ${sbindir}/chpasswd chpasswd chpasswd.${PN} 200
102 update-alternatives --install ${bindir}/chfn chfn chfn.${PN} 200
103 update-alternatives --install ${bindir}/newgrp newgrp newgrp.${PN} 200
104 update-alternatives --install ${bindir}/chsh chsh chsh.${PN} 200
105 update-alternatives --install ${base_bindir}/login login login.${PN} 200
106 update-alternatives --install ${base_sbindir}/vipw vipw vipw.${PN} 200
107 update-alternatives --install ${base_sbindir}/vigr vigr vigr.${PN} 200
108
109 if [ "x$D" != "x" ]; then
110 exit 1
111 fi
112
113 pwconv
114 grpconv
115}
116
117pkg_prerm_${PN} () {
118 for i in passwd chpasswd chfn newgrp chsh login vipw vigr ; do
119 update-alternatives --remove $i $i.${PN}
120 done
121}
diff --git a/meta-lsb/packages/shadow/shadow_4.1.4.2.bb b/meta-lsb/packages/shadow/shadow_4.1.4.2.bb
deleted file mode 100644
index bc00c099bf..0000000000
--- a/meta-lsb/packages/shadow/shadow_4.1.4.2.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1require shadow.inc
2
3PR = "r0"
4
5SRC_URI += "file://shadow.automake-1.11.patch \
6 file://shadow-4.1.3-dots-in-usernames.patch \
7 file://shadow-4.1.4.2-env-reset-keep-locale.patch \
8 file://shadow-4.1.4.2-groupmod-pam-check.patch \
9 file://shadow-4.1.4.2-su_no_sanitize_env.patch"
10
11EXTRA_OECONF_libc-uclibc += " --with-nscd=no "
diff --git a/meta-lsb/packages/sysstat/files/99_sysstat b/meta-lsb/packages/sysstat/files/99_sysstat
deleted file mode 100644
index 0b0ec30de0..0000000000
--- a/meta-lsb/packages/sysstat/files/99_sysstat
+++ /dev/null
@@ -1 +0,0 @@
1d root root 0755 /var/log/sa none
diff --git a/meta-lsb/packages/sysstat/sysstat.inc b/meta-lsb/packages/sysstat/sysstat.inc
deleted file mode 100644
index 564bc7da07..0000000000
--- a/meta-lsb/packages/sysstat/sysstat.inc
+++ /dev/null
@@ -1,33 +0,0 @@
1DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux."
2HOMEPAGE = "http://sebastien.godard.pagesperso-orange.fr/"
3LICENSE = "GPLv2+"
4SECTION = "console/utils"
5
6DEPENDS = "virtual/libintl"
7
8SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz \
9 file://99_sysstat"
10
11inherit autotools
12
13do_install() {
14 autotools_do_install
15
16 # don't install /var/log/sa when populating rootfs. Do it through volatile
17
18 rm -rf ${D}/var
19 install -d ${D}/etc/default/volatiles
20 install -m 0644 ${WORKDIR}/99_sysstat ${D}/etc/default/volatiles
21}
22
23pkg_postinst_${PN} () {
24 /etc/init.d/populate-volatile.sh update
25}
26
27
28FILES_${PN} += "${libdir}/sa"
29
30TARGET_CC_ARCH += "${LDFLAGS}"
31LDFLAGS_append_linux-uclibc = " -lintl"
32LDFLAGS_append_linux-uclibceabi = " -lintl"
33LDFLAGS_append_linux-uclibcspe = " -lintl"
diff --git a/meta-lsb/packages/sysstat/sysstat_9.1.4.bb b/meta-lsb/packages/sysstat/sysstat_9.1.4.bb
deleted file mode 100644
index d7b7e667d6..0000000000
--- a/meta-lsb/packages/sysstat/sysstat_9.1.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require sysstat.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
4
5PR = "r0"
6
7
diff --git a/meta-lsb/packages/tar/tar-1.17/gcc43build.patch b/meta-lsb/packages/tar/tar-1.17/gcc43build.patch
deleted file mode 100644
index cc5f0e13d0..0000000000
--- a/meta-lsb/packages/tar/tar-1.17/gcc43build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1# Fix errors when built with gcc 4.3
2# Patch taken from Debian bug #452096
3
4diff -urN tar-1.17.orig/lib/argp-fmtstream.h tar-1.17/lib/argp-fmtstream.h
5--- tar-1.17.orig/lib/argp-fmtstream.h 2006-01-11 12:24:05.000000000 -0800
6+++ tar-1.17/lib/argp-fmtstream.h 2010-07-22 22:36:12.000000000 -0700
7@@ -198,7 +198,11 @@
8 #endif
9
10 #ifndef ARGP_FS_EI
11-#define ARGP_FS_EI extern inline
12+ #if defined __GNUC_STDC_INLINE__
13+ #define ARGP_FS_EI extern inline __attribute__((__gnu_inline__))
14+ #else
15+ #define ARGP_FS_EI extern inline
16+ #endif
17 #endif
18
19 ARGP_FS_EI size_t
20diff -urN tar-1.17.orig/lib/argp.h tar-1.17/lib/argp.h
21--- tar-1.17.orig/lib/argp.h 2007-03-30 00:09:11.000000000 -0700
22+++ tar-1.17/lib/argp.h 2010-07-22 22:38:44.000000000 -0700
23@@ -580,7 +580,11 @@
24 # endif
25
26 # ifndef ARGP_EI
27-# define ARGP_EI extern __inline__
28+# if defined __GNUC_STDC_INLINE__
29+# define ARGP_EI extern __inline__ __attribute__((__gnu_inline__))
30+# else
31+# define ARGP_EI extern __inline__
32+# endif
33 # endif
34
35 ARGP_EI void
diff --git a/meta-lsb/packages/tar/tar-1.17/m4extensions.patch b/meta-lsb/packages/tar/tar-1.17/m4extensions.patch
deleted file mode 100644
index 11b981aa92..0000000000
--- a/meta-lsb/packages/tar/tar-1.17/m4extensions.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1# Define AC_USE_SYSTEM_EXTENSIONS only if it was previously undefined.
2# This is needed to configure correctly with newer versions of autoconf.
3
4--- tar-1.17/m4/extensions.m4.orig 2010-07-22 22:21:35.000000000 -0700
5+++ tar-1.17/m4/extensions.m4 2010-07-22 22:23:41.000000000 -0700
6@@ -1,4 +1,4 @@
7-# serial 4 -*- Autoconf -*-
8+# serial 5 -*- Autoconf -*-
9 # Enable extensions on systems that normally disable them.
10
11 # Copyright (C) 2003, 2006 Free Software Foundation, Inc.
12@@ -16,6 +16,7 @@
13 # ------------------------
14 # Enable extensions on systems that normally disable them,
15 # typically due to standards-conformance issues.
16+m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [], [
17 AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
18 [
19 AC_BEFORE([$0], [AC_COMPILE_IFELSE])
20@@ -48,7 +49,7 @@
21 AC_DEFINE([__EXTENSIONS__])
22 AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
23 AC_DEFINE([_TANDEM_SOURCE])
24-])
25+])])
26
27 # gl_USE_SYSTEM_EXTENSIONS
28 # ------------------------
diff --git a/meta-lsb/packages/tar/tar.inc b/meta-lsb/packages/tar/tar.inc
deleted file mode 100644
index cf72d4893b..0000000000
--- a/meta-lsb/packages/tar/tar.inc
+++ /dev/null
@@ -1,25 +0,0 @@
1DESCRIPTION = "GNU tar saves many files together into a single tape \
2or disk archive, and can restore individual files from the archive."
3HOMEPAGE = "http://www.gnu.org/software/tar/"
4SECTION = "base"
5
6SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2"
7
8inherit autotools gettext
9
10do_install () {
11 autotools_do_install
12 install -d ${D}${base_bindir}
13 mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN}
14 mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN}
15}
16
17pkg_postinst_${PN} () {
18 update-alternatives --install ${base_bindir}/tar tar tar.${PN} 100
19 update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 100
20}
21
22pkg_prerm_${PN} () {
23 update-alternatives --remove tar tar.${PN}
24 update-alternatives --remove rmt rmt.${PN}
25}
diff --git a/meta-lsb/packages/tar/tar_1.17.bb b/meta-lsb/packages/tar/tar_1.17.bb
deleted file mode 100644
index be74542091..0000000000
--- a/meta-lsb/packages/tar/tar_1.17.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require tar.inc
2
3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
5
6PR = "r0"
7
8SRC_URI += "file://m4extensions.patch \
9 file://gcc43build.patch \
10 "
11
12SRC_URI[md5sum] = "c6c4f1c075dbf0f75c29737faa58f290"
13SRC_URI[sha256sum] = "19f9021dda51a16295e4706e80870e71f87107675e51c176a491eba0fc4ca492"
diff --git a/meta-lsb/packages/tar/tar_1.23.bb b/meta-lsb/packages/tar/tar_1.23.bb
deleted file mode 100644
index 093c0b43ce..0000000000
--- a/meta-lsb/packages/tar/tar_1.23.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require tar.inc
2
3LICENSE = "GPLv3"
4LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
5
6PR = "r0"
7
8SRC_URI[md5sum] = "41e2ca4b924ec7860e51b43ad06cdb7e"
9SRC_URI[sha256sum] = "c9328372db62fbb1d94c9e4e3cefc961111af46de47085b635359c00a0eebe36"
diff --git a/meta-lsb/packages/tasks/task-poky-basic.bb b/meta-lsb/packages/tasks/task-poky-basic.bb
deleted file mode 100644
index bbd4205ce9..0000000000
--- a/meta-lsb/packages/tasks/task-poky-basic.bb
+++ /dev/null
@@ -1,156 +0,0 @@
1#
2# Copyright (C) 2010 Intel Corporation
3#
4
5DESCRIPTION = "Create Basic Image Tasks"
6PR = "r1"
7
8PACKAGES = "\
9 task-poky-basic \
10 task-poky-base-utils \
11 task-poky-base-utils-dbg \
12 task-poky-base-utils-dev \
13 task-poky-basic-libs \
14 task-poky-basic-libs-dbg \
15 task-poky-basic-libs-dev \
16 task-poky-basic-utils \
17 task-poky-basic-utils-dbg \
18 task-poky-basic-utils-dev \
19 task-poky-basic-extended \
20 task-poky-basic-extended-dbg \
21 task-poky-basic-extended-dev \
22 task-poky-dev-utils \
23 task-poky-dev-utils-dbg \
24 task-poky-dev-utils-dev \
25 task-poky-multiuser \
26 task-poky-multiuser-dbg \
27 task-poky-multiuser-dev \
28 task-poky-initscripts \
29 task-poky-initscripts-dbg \
30 task-poky-initscripts-dev \
31 task-poky-rpm \
32 task-poky-rpm-dbg \
33 task-poky-rpm-dev \
34 task-poky-sys-services \
35 task-poky-sys-services-dbg \
36 task-poky-sys-services-dev \
37 "
38
39ALLOW_EMPTY = "1"
40
41RDEPENDS_task-poky-basic = "\
42 task-poky-base-utils \
43 task-poky-basic-libs \
44 task-poky-basic-utils \
45 task-poky-basic-extended \
46 task-poky-dev-utils \
47 task-poky-multiuser \
48 task-poky-initscripts \
49 task-poky-rpm \
50 task-poky-sys-services \
51 "
52
53RDEPENDS_task-poky-base-utils = "\
54 busybox \
55 dropbear \
56 "
57
58RDEPENDS_task-poky-basic-libs = "\
59 glib-2.0 \
60 "
61
62RDEPENDS_task-poky-basic-utils = "\
63 bash \
64 acl \
65 attr \
66 bc \
67 coreutils \
68 cpio \
69 e2fsprogs \
70 ed \
71 file \
72 findutils \
73 gawk \
74 gmp \
75 grep \
76 makedevs \
77 mktemp \
78 ncurses \
79 net-tools \
80 pax \
81 popt \
82 procps \
83 psmisc \
84 sed \
85 tar \
86 time \
87 udev \
88 util-linux \
89 zlib \
90 "
91
92RDEPENDS_task-poky-basic-extended = "\
93 iproute2 \
94 iputils \
95 iptables \
96 module-init-tools \
97# openssh \
98 openssl \
99 "
100
101RDEPENDS_task-poky-dev-utils = "\
102 byacc \
103 diffutils \
104 m4 \
105 make \
106 patch \
107 binutils \
108 "
109
110RDEPENDS_task-poky-initscripts = "\
111 initscripts \
112 sysvinit \
113 ethtool \
114# mingetty \
115# sysklogd \
116 "
117
118RDEPENDS_task-poky-multiuser = "\
119 cracklib \
120 gzip \
121 libuser \
122 libpam \
123 shadow \
124 sudo \
125 "
126
127RDEPENDS_task-poky-rpm = "\
128 beecrypt \
129 rpm \
130 "
131
132RDEPENDS_task-poky-sys-services = "\
133# at \
134 bzip2 \
135# cronie \
136# crontabs \
137 dbus \
138 dbus-glib \
139 python-dbus \
140 elfutils \
141 gzip \
142 hal \
143 less \
144 libcap \
145 libevent \
146# logrotate \
147 nfs-utils \
148 pciutils \
149 libpcre \
150 portmap \
151# rpcbind \
152 sysfsutils \
153 tcp-wrappers \
154 tzdata \
155 "
156
diff --git a/meta-lsb/packages/tasks/task-poky-lsb.bb b/meta-lsb/packages/tasks/task-poky-lsb.bb
deleted file mode 100644
index 4718f3b760..0000000000
--- a/meta-lsb/packages/tasks/task-poky-lsb.bb
+++ /dev/null
@@ -1,103 +0,0 @@
1#
2# Copyright (C) 2010 Intel Corporation
3#
4
5DESCRIPTION = "Create Small Image Tasks"
6PR = "r1"
7
8PACKAGES = "\
9 task-poky-lsb \
10 task-poky-sys-extended \
11 task-poky-sys-extended-dbg \
12 task-poky-sys-extended-dev \
13 task-poky-db \
14 task-poky-db-dbg \
15 task-poky-db-dev \
16 task-poky-misc \
17 task-poky-misc-dbg \
18 task-poky-misc-dev \
19 task-poky-perl \
20 task-poky-perl-dbg \
21 task-poky-perl-dev \
22 task-poky-python \
23 task-poky-python-dbg \
24 task-poky-python-dev \
25 task-poky-tcl \
26 task-poky-tcl-dbg \
27 task-poky-tcl-dev \
28 "
29
30ALLOW_EMPTY = "1"
31
32RDEPENDS_task-poky-lsb = "\
33 task-poky-sys-extended \
34 task-poky-db \
35 task-poky-misc \
36 task-poky-perl \
37 task-poky-python \
38 task-poky-tcl \
39 "
40
41#
42# GPLv2 Should List
43RDEPENDS_task-poky-sys-extended = "\
44 curl \
45 diffutils \
46 gamin \
47 hdparm \
48# libaio \
49 libxml2 \
50 lrzsz \
51 lzo \
52# mdadm \
53 minicom \
54 neon \
55 parted \
56 pth \
57 quota \
58# screen \
59 setserial \
60 sysstat \
61 unzip \
62# watchdog \
63 which \
64 zip \
65 "
66
67RDEPENDS_task-poky-db = "\
68 db \
69 sqlite3 \
70 "
71
72RDEPENDS_task-poky-perl = "\
73 gdbm \
74 perl \
75 zlib \
76 "
77
78
79RDEPENDS_task-poky-python = "\
80 expat \
81 gdbm \
82 gmp \
83 ncurses \
84 openssl \
85 python \
86 readline \
87 zip \
88 "
89
90RDEPENDS_task-poky-tcl = "\
91 tcl \
92 "
93
94RDEPENDS_task-poky-misc = "\
95 elfutils \
96 gettext \
97 lsof \
98 ncurses \
99 strace \
100 libusb1 \
101 usbutils \
102 zlib \
103 "
diff --git a/meta-lsb/packages/which/which-2.18/fix_name_conflict_group_member.patch b/meta-lsb/packages/which/which-2.18/fix_name_conflict_group_member.patch
deleted file mode 100644
index 568d4233fd..0000000000
--- a/meta-lsb/packages/which/which-2.18/fix_name_conflict_group_member.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1# glibc also implements the function group_member. To avoid name conflict,
2# here let us append a "_" to which's version.
3#
4# Signed-off-by Dexuan Cui <dexuan.cui@intel.com>, 2010-08-20
5# (this patch is licensed under GPLv2)
6
7--- which-2.18/bash.c
8+++ which-2.18/bash.c
9@@ -45,7 +45,12 @@
10 * - changed all occurences of 'gid_t' into 'GID_T'.
11 * - exported functions needed in which.c
12 */
13-static int group_member (GID_T gid);
14+
15+/*
16+ * glibc also implements the function group_member. To avoid name conflict,
17+ * here let us append a "_" to which's version.
18+ */
19+static int _group_member (GID_T gid);
20 static char* extract_colon_unit (char const* string, int *p_index);
21
22 /*===========================================================================
23@@ -200,8 +205,8 @@
24
25 /* From bash-2.05b / general.c / line 805 */
26 /* Return non-zero if GID is one that we have in our groups list. */
27-int
28-group_member (GID_T gid)
29+static int
30+_group_member (GID_T gid)
31 {
32 #if defined (HAVE_GETGROUPS)
33 register int i;
34@@ -290,7 +295,7 @@
35 return (X_BIT (u_mode_bits (finfo.st_mode))) ? (FS_EXISTS | FS_EXECABLE) : FS_EXISTS;
36
37 /* Otherwise, if we are in the owning group, the group permissions apply. */
38- if (group_member (finfo.st_gid))
39+ if (_group_member (finfo.st_gid))
40 return (X_BIT (g_mode_bits (finfo.st_mode))) ? (FS_EXISTS | FS_EXECABLE) : FS_EXISTS;
41
42 /* Otherwise, if we are in the other group, the other permissions apply. */
43@@ -331,7 +336,7 @@
44 /* Given a string containing units of information separated by colons,
45 return the next one pointed to by (P_INDEX), or NULL if there are no more.
46 Advance (P_INDEX) to the character after the colon. */
47-char*
48+static char*
49 extract_colon_unit (char const* string, int* p_index)
50 {
51 int i, start, len;
diff --git a/meta-lsb/packages/which/which-2.20/remove-declaration.patch b/meta-lsb/packages/which/which-2.20/remove-declaration.patch
deleted file mode 100644
index 09b81439b6..0000000000
--- a/meta-lsb/packages/which/which-2.20/remove-declaration.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Remove the declaration of group_member since it has already been
2declared in unistd.h
3
4Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
5
6diff -ruN which-2.20-orig/bash.c which-2.20/bash.c
7--- which-2.20-orig/bash.c 2010-08-03 12:59:08.897088878 +0800
8+++ which-2.20/bash.c 2010-08-03 13:17:23.406097212 +0800
9@@ -46,7 +46,6 @@
10 * - changed all occurences of 'gid_t' into 'GID_T'.
11 * - exported functions needed in which.c
12 */
13-static int group_member (GID_T gid);
14 static char* extract_colon_unit (char const* string, int* p_index);
15
16 /*===========================================================================
diff --git a/meta-lsb/packages/which/which_2.18.bb b/meta-lsb/packages/which/which_2.18.bb
deleted file mode 100644
index b177949788..0000000000
--- a/meta-lsb/packages/which/which_2.18.bb
+++ /dev/null
@@ -1,40 +0,0 @@
1DESCRIPTION = "Which is a utility that prints out the full path of the \
2executables that bash(1) would execute when the passed \
3program names would have been entered on the shell prompt. \
4It does this by using the exact same algorithm as bash."
5HOMEPAGE = "http://www.xs4all.nl/~carlo17/which/"
6BUGTRACKER = "n/a"
7
8LICENSE = "GPLv2+"
9LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
10
11PR = "r0"
12
13SRC_URI = "http://www.xs4all.nl/~carlo17/which/which-${PV}.tar.gz \
14 file://fix_name_conflict_group_member.patch"
15
16DEPENDS = "cwautomacros-native"
17
18inherit autotools
19
20do_configure_prepend() {
21 OLD="@ACLOCAL_CWFLAGS@"
22 NEW="-I ${STAGING_DIR_NATIVE}/${datadir}/cwautomacros/m4"
23 sed -i "s#${OLD}#${NEW}#g" `grep -rl ${OLD} ${S}`
24}
25do_install_append() {
26 mv ${D}/${bindir}/which ${D}/${bindir}/which.${PN}
27}
28
29pkg_postinst_${PN}() {
30 if [ "${PN}" = "${BPN}" ] ; then
31 update-alternatives --install ${bindir}/which which which.${PN} 100
32 fi
33}
34
35pkg_prerm_${PN}() {
36 if [ "${PN}" = "${BPN}" ] ; then
37 update-alternatives --remove which which.${PN}
38 fi
39}
40
diff --git a/meta-lsb/packages/which/which_2.20.bb b/meta-lsb/packages/which/which_2.20.bb
deleted file mode 100644
index b7730de3b3..0000000000
--- a/meta-lsb/packages/which/which_2.20.bb
+++ /dev/null
@@ -1,35 +0,0 @@
1DESCRIPTION = "which - shows the full path of (shell) commands."
2SECTION = "libs"
3LICENSE = "GPLv3+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
5 file://which.c;beginline=1;endline=17;md5=a9963693af2272e7a8df6f231164e7a2"
6HOMEPAGE = "http://ftp.gnu.org/gnu/which/"
7DEPENDS = "cwautomacros-native"
8
9inherit autotools
10
11PR = "r0"
12
13SRC_URI = "http://ftp.gnu.org/gnu/which/which-${PV}.tar.gz \
14 file://remove-declaration.patch"
15
16do_configure_prepend() {
17 sed -i -e 's%@ACLOCAL_CWFLAGS@%-I ${STAGING_DIR_NATIVE}/usr/share/cwautomacros/m4%g' ${S}/Makefile.am ${S}/tilde/Makefile.am
18}
19
20do_install() {
21 autotools_do_install
22 mv ${D}${bindir}/which ${D}${bindir}/which.${PN}
23}
24
25pkg_postinst_${PN} () {
26 if [ "${PN}" = "${BPN}" ] ; then
27 update-alternatives --install ${bindir}/which which which.${PN} 100
28 fi
29}
30
31pkg_prerm_${PN} () {
32 if [ "${PN}" = "${BPN}" ] ; then
33 update-alternatives --remove which which.${PN}
34 fi
35}
diff --git a/meta-lsb/packages/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch b/meta-lsb/packages/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch
deleted file mode 100644
index 8602a88702..0000000000
--- a/meta-lsb/packages/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch
+++ /dev/null
@@ -1,84 +0,0 @@
1From d588b6530e1382a624898b3f4307f636c72c80a9 Mon Sep 17 00:00:00 2001
2From: Pierre Habouzit <madcoder@debian.org>
3Date: Wed, 28 Nov 2007 10:13:08 +0100
4Subject: [PATCH] Disable services from inetd.conf if a service with the same id exists.
5
6 This way, if a service is enabled in /etc/xinetd* _and_ in
7/etc/inetd.conf, the one (even if disabled) from /etc/xinetd* takes
8precedence.
9
10Signed-off-by: Pierre Habouzit <madcoder@debian.org>
11---
12 xinetd/inet.c | 22 +++++++++++++++++++---
13 1 files changed, 19 insertions(+), 3 deletions(-)
14
15diff --git a/xinetd/inet.c b/xinetd/inet.c
16index 1cb2ba2..8caab45 100644
17--- a/xinetd/inet.c
18+++ b/xinetd/inet.c
19@@ -23,6 +23,8 @@
20 #include "parsesup.h"
21 #include "nvlists.h"
22
23+static psi_h iter ;
24+
25 static int get_next_inet_entry( int fd, pset_h sconfs,
26 struct service_config *defaults);
27
28@@ -32,12 +34,15 @@ void parse_inet_conf_file( int fd, struct configuration *confp )
29 struct service_config *default_config = CNF_DEFAULTS( confp );
30
31 line_count = 0;
32+ iter = psi_create (sconfs);
33
34 for( ;; )
35 {
36 if (get_next_inet_entry(fd, sconfs, default_config) == -2)
37 break;
38 }
39+
40+ psi_destroy(iter);
41 }
42
43 static int get_next_inet_entry( int fd, pset_h sconfs,
44@@ -46,7 +51,7 @@ static int get_next_inet_entry( int fd, pset_h sconfs,
45 char *p;
46 str_h strp;
47 char *line = next_line(fd);
48- struct service_config *scp;
49+ struct service_config *scp, *tmp;
50 unsigned u, i;
51 const char *func = "get_next_inet_entry";
52 char *name = NULL, *rpcvers = NULL, *rpcproto = NULL;
53@@ -405,7 +410,16 @@ static int get_next_inet_entry( int fd, pset_h sconfs,
54 SC_SPECIFY( scp, A_SOCKET_TYPE );
55 SC_SPECIFY( scp, A_WAIT );
56
57- if( ! pset_add(sconfs, scp) )
58+ for ( tmp = SCP( psi_start( iter ) ) ; tmp ; tmp = SCP( psi_next(iter)) ){
59+ if (EQ(SC_ID(scp), SC_ID(tmp))) {
60+ parsemsg(LOG_DEBUG, func, "removing duplicate service %s", SC_NAME(scp));
61+ sc_free(scp);
62+ scp = NULL;
63+ break;
64+ }
65+ }
66+
67+ if( scp && ! pset_add(sconfs, scp) )
68 {
69 out_of_memory( func );
70 pset_destroy(args);
71@@ -414,7 +428,9 @@ static int get_next_inet_entry( int fd, pset_h sconfs,
72 }
73
74 pset_destroy(args);
75- parsemsg( LOG_DEBUG, func, "added service %s", SC_NAME(scp));
76+ if (scp) {
77+ parsemsg( LOG_DEBUG, func, "added service %s", SC_NAME(scp));
78+ }
79 return 0;
80 }
81
82--
831.5.3.6.2040.g15e6
84
diff --git a/meta-lsb/packages/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch b/meta-lsb/packages/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch
deleted file mode 100644
index d243692769..0000000000
--- a/meta-lsb/packages/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch
+++ /dev/null
@@ -1,77 +0,0 @@
1From a3410b0bc81ab03a889d9ffc14e351badf8372f1 Mon Sep 17 00:00:00 2001
2From: Pierre Habouzit <madcoder@debian.org>
3Date: Mon, 26 Nov 2007 16:02:04 +0100
4Subject: [PATCH] Various fixes from the previous maintainer.
5
6---
7 xinetd/child.c | 20 +++++++++++++++++---
8 xinetd/service.c | 8 ++++----
9 2 files changed, 21 insertions(+), 7 deletions(-)
10
11diff --git a/xinetd/child.c b/xinetd/child.c
12index 89ee54c..48e9615 100644
13--- a/xinetd/child.c
14+++ b/xinetd/child.c
15@@ -284,6 +284,7 @@ void child_process( struct server *serp )
16 connection_s *cp = SERVER_CONNECTION( serp ) ;
17 struct service_config *scp = SVC_CONF( sp ) ;
18 const char *func = "child_process" ;
19+ int fd, null_fd;
20
21 signal_default_state();
22
23@@ -296,9 +297,22 @@ void child_process( struct server *serp )
24 signals_pending[0] = -1;
25 signals_pending[1] = -1;
26
27- Sclose(0);
28- Sclose(1);
29- Sclose(2);
30+ if ( ( null_fd = open( "/dev/null", O_RDONLY ) ) == -1 )
31+ {
32+ msg( LOG_ERR, func, "open('/dev/null') failed: %m") ;
33+ _exit( 1 ) ;
34+ }
35+
36+ for ( fd = 0 ; fd <= MAX_PASS_FD ; fd++ )
37+ {
38+ if ( fd != null_fd && dup2( null_fd, fd ) == -1 )
39+ {
40+ msg( LOG_ERR, func, "dup2(%d, %d) failed: %m") ;
41+ _exit( 1 ) ;
42+ }
43+ }
44+ if ( null_fd > MAX_PASS_FD )
45+ (void) Sclose( null_fd ) ;
46
47
48 #ifdef DEBUG_SERVER
49diff --git a/xinetd/service.c b/xinetd/service.c
50index 3d68d78..0132d6c 100644
51--- a/xinetd/service.c
52+++ b/xinetd/service.c
53@@ -745,8 +745,8 @@ static status_e failed_service(struct service *sp,
54 return FAILED;
55
56 if ( last == NULL ) {
57- last = SAIN( calloc( 1, sizeof(union xsockaddr) ) );
58- SVC_LAST_DGRAM_ADDR(sp) = (union xsockaddr *)last;
59+ SVC_LAST_DGRAM_ADDR(sp) = SAIN( calloc( 1, sizeof(union xsockaddr) ) );
60+ last = SAIN( SVC_LAST_DGRAM_ADDR(sp) );
61 }
62
63 (void) time( &current_time ) ;
64@@ -772,8 +772,8 @@ static status_e failed_service(struct service *sp,
65 return FAILED;
66
67 if( last == NULL ) {
68- last = SAIN6(calloc( 1, sizeof(union xsockaddr) ) );
69- SVC_LAST_DGRAM_ADDR( sp ) = (union xsockaddr *)last;
70+ SVC_LAST_DGRAM_ADDR(sp) = SAIN6(calloc( 1, sizeof(union xsockaddr) ) );
71+ last = SAIN6(SVC_LAST_DGRAM_ADDR(sp));
72 }
73
74 (void) time( &current_time ) ;
75--
761.5.3.6.2040.g15e6
77
diff --git a/meta-lsb/packages/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch b/meta-lsb/packages/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch
deleted file mode 100644
index 2b76fe3d41..0000000000
--- a/meta-lsb/packages/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch
+++ /dev/null
@@ -1,110 +0,0 @@
1From f44b218ccc779ab3f4aed072390ccf129d94b58d Mon Sep 17 00:00:00 2001
2From: David Madore <david@pleiades.stars>
3Date: Mon, 24 Mar 2008 12:45:36 +0100
4Subject: [PATCH] xinetd should be able to listen on IPv6 even in -inetd_compat mode
5
6xinetd does not bind to IPv6 addresses (and does not seem to have an
7option to do so) when used in -inetd_compat mode. As current inetd's
8are IPv6-aware, this is a problem: this means xinetd cannot be used as
9a drop-in inetd replacement.
10
11The attached patch is a suggestion: it adds a -inetd_ipv6 global
12option that, if used, causes inetd-compatibility lines to have an
13implicit "IPv6" option. Perhaps this is not the best solution, but
14there should definitely be a way to get inetd.conf to be read in
15IPv6-aware mode.
16---
17 xinetd/confparse.c | 1 +
18 xinetd/inet.c | 17 +++++++++++++++++
19 xinetd/options.c | 3 +++
20 xinetd/xinetd.man | 6 ++++++
21 4 files changed, 27 insertions(+), 0 deletions(-)
22
23diff --git a/xinetd/confparse.c b/xinetd/confparse.c
24index db9f431..d7b0bcc 100644
25--- a/xinetd/confparse.c
26+++ b/xinetd/confparse.c
27@@ -40,6 +40,7 @@
28 #include "inet.h"
29 #include "main.h"
30
31+extern int inetd_ipv6;
32 extern int inetd_compat;
33
34 /*
35diff --git a/xinetd/inet.c b/xinetd/inet.c
36index 8caab45..2e617ae 100644
37--- a/xinetd/inet.c
38+++ b/xinetd/inet.c
39@@ -25,6 +25,8 @@
40
41 static psi_h iter ;
42
43+extern int inetd_ipv6;
44+
45 static int get_next_inet_entry( int fd, pset_h sconfs,
46 struct service_config *defaults);
47
48@@ -360,6 +362,21 @@ static int get_next_inet_entry( int fd, pset_h sconfs,
49 }
50 SC_SERVER_ARGV(scp)[u] = p;
51 }
52+
53+ /* Set the IPv6 flag if we were passed the -inetd_ipv6 option */
54+ if ( inetd_ipv6 )
55+ {
56+ nvp = nv_find_value( service_flags, "IPv6" );
57+ if ( nvp == NULL )
58+ {
59+ parsemsg( LOG_WARNING, func, "inetd.conf - Bad foo %s", name ) ;
60+ pset_destroy(args);
61+ sc_free(scp);
62+ return -1;
63+ }
64+ M_SET(SC_XFLAGS(scp), nvp->value);
65+ }
66+
67 /* Set the reuse flag, as this is the default for inetd */
68 nvp = nv_find_value( service_flags, "REUSE" );
69 if ( nvp == NULL )
70diff --git a/xinetd/options.c b/xinetd/options.c
71index b058b6a..dc2f3a0 100644
72--- a/xinetd/options.c
73+++ b/xinetd/options.c
74@@ -30,6 +30,7 @@ int logprocs_option ;
75 unsigned logprocs_option_arg ;
76 int stayalive_option=0;
77 char *program_name ;
78+int inetd_ipv6 = 0 ;
79 int inetd_compat = 0 ;
80 int dont_fork = 0;
81
82@@ -128,6 +129,8 @@ int opt_recognize( int argc, char *argv[] )
83 fprintf(stderr, "\n");
84 exit(0);
85 }
86+ else if ( strcmp ( &argv[ arg ][ 1 ], "inetd_ipv6" ) == 0 )
87+ inetd_ipv6 = 1;
88 else if ( strcmp ( &argv[ arg ][ 1 ], "inetd_compat" ) == 0 )
89 inetd_compat = 1;
90 }
91diff --git a/xinetd/xinetd.man b/xinetd/xinetd.man
92index c76c3c6..c9dd803 100644
93--- a/xinetd/xinetd.man
94+++ b/xinetd/xinetd.man
95@@ -106,6 +106,12 @@ This option causes xinetd to read /etc/inetd.conf in addition to the
96 standard xinetd config files. /etc/inetd.conf is read after the
97 standard xinetd config files.
98 .TP
99+.BI \-inetd_ipv6
100+This option causes xinetd to bind to IPv6 (AF_INET6) addresses for
101+inetd compatibility lines (see previous option). This only affects
102+how /etc/inetd.conf is interpreted and thus only has any effect if
103+the \-inetd_compat option is also used.
104+.TP
105 .BI \-cc " interval"
106 This option instructs
107 .B xinetd
108--
1091.5.5.rc0.127.gb4337
110
diff --git a/meta-lsb/packages/xinetd/xinetd/xinetd.conf b/meta-lsb/packages/xinetd/xinetd/xinetd.conf
deleted file mode 100644
index 9e6ea2577e..0000000000
--- a/meta-lsb/packages/xinetd/xinetd/xinetd.conf
+++ /dev/null
@@ -1,11 +0,0 @@
1# Simple configuration file for xinetd
2#
3# Some defaults, and include /etc/xinetd.d/
4
5defaults
6{
7
8
9}
10
11includedir /etc/xinetd.d
diff --git a/meta-lsb/packages/xinetd/xinetd/xinetd.init b/meta-lsb/packages/xinetd/xinetd/xinetd.init
deleted file mode 100644
index 26dbea7415..0000000000
--- a/meta-lsb/packages/xinetd/xinetd/xinetd.init
+++ /dev/null
@@ -1,57 +0,0 @@
1#!/bin/sh
2#
3# /etc/init.d/xinetd -- script to start and stop xinetd.
4
5if test -f /etc/default/xinetd; then
6 . /etc/default/xinetd
7fi
8
9
10test -x /usr/sbin/xinetd || exit 0
11
12checkportmap () {
13 if grep "^[^ *#]" /etc/xinetd.conf | grep -q 'rpc/'; then
14 if ! rpcinfo -u localhost portmapper >/dev/null 2>&1; then
15 echo
16 echo "WARNING: portmapper inactive - RPC services unavailable!"
17 echo " Commenting out or removing the RPC services from"
18 echo " the /etc/xinetd.conf file will remove this message."
19 echo
20 fi
21 fi
22}
23
24case "$1" in
25 start)
26 checkportmap
27 echo -n "Starting internet superserver: xinetd"
28 start-stop-daemon --start --quiet --background --exec /usr/sbin/xinetd -- -pidfile /var/run/xinetd.pid $XINETD_OPTS
29 echo "."
30 ;;
31 stop)
32 echo -n "Stopping internet superserver: xinetd"
33 start-stop-daemon --stop --signal 3 --quiet --exec /usr/sbin/xinetd
34 echo "."
35 ;;
36 reload)
37 echo -n "Reloading internet superserver configuration: xinetd"
38 start-stop-daemon --stop --signal 1 --quiet --exec /usr/sbin/xinetd
39 echo "."
40 ;;
41 force-reload)
42 echo "$0 force-reload: Force Reload is deprecated"
43 echo -n "Forcefully reloading internet superserver configuration: xinetd"
44 start-stop-daemon --stop --signal 1 --quiet --exec /usr/sbin/xinetd
45 echo "."
46 ;;
47 restart)
48 $0 stop
49 $0 start
50 ;;
51 *)
52 echo "Usage: /etc/init.d/xinetd {start|stop|reload|force-reload|restart}"
53 exit 1
54 ;;
55esac
56
57exit 0
diff --git a/meta-lsb/packages/xinetd/xinetd_2.3.14.bb b/meta-lsb/packages/xinetd/xinetd_2.3.14.bb
deleted file mode 100644
index 122be2c18d..0000000000
--- a/meta-lsb/packages/xinetd/xinetd_2.3.14.bb
+++ /dev/null
@@ -1,45 +0,0 @@
1DESCRIPTION = "Highly configurable, modular and secure inetd"
2HOMEPAGE = "http://www.xinetd.org"
3
4# xinetd is a BSD-like license
5LICENSE = "xinetd"
6LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8"
7
8DEPENDS = ""
9PR ="r0"
10
11SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \
12 file://xinetd.init \
13 file://xinetd.conf \
14 file://Various-fixes-from-the-previous-maintainer.patch \
15 file://Disable-services-from-inetd.conf-if-a-service-with-t.patch \
16 file://xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch \
17 "
18
19inherit autotools update-rc.d
20
21INITSCRIPT_NAME = "xinetd"
22INITSCRIPT_PARAMS = "defaults"
23
24EXTRA_OECONF="--disable-nls"
25
26do_configure() {
27 # Looks like configure.in is broken, so we are skipping
28 # rebuilding configure and are just using the shipped one
29 oe_runconf
30}
31
32do_install() {
33 # Same here, the Makefile does some really stupid things,
34 # but since we only want two files why not override
35 # do_install from autotools and doing it ourselfs?
36 install -d "${D}/usr/sbin"
37 install -d "${D}/etc/init.d"
38 install -d "${D}/etc/xinetd.d"
39 install -m 644 "${WORKDIR}/xinetd.conf" "${D}/etc"
40 install -m 755 "${WORKDIR}/xinetd.init" "${D}/etc/init.d/xinetd"
41 install -m 755 "${S}/xinetd/xinetd" "${D}/usr/sbin"
42 install -m 755 "${S}/xinetd/itox" "${D}/usr/sbin"
43}
44
45CONFFILES_${PN} = "${sysconfdir}/xinetd.conf"
diff --git a/meta-lsb/packages/xz/xz_4.999.9beta.bb b/meta-lsb/packages/xz/xz_4.999.9beta.bb
deleted file mode 100644
index ca76182344..0000000000
--- a/meta-lsb/packages/xz/xz_4.999.9beta.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1DESCRIPTION = "utils for managing LZMA compressed files"
2HOMEPAGE = "http://tukaani.org/xz/"
3SECTION = "base"
4
5LICENSE = "GPLv2+ & GPLv3+ & LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \
7 file://COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe \
8 file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
9 file://COPYING.LGPLv2.1;md5=fbc093901857fcd118f065f900982c24 \
10 file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 "
11
12SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.gz"
13
14DEPENDS = "gettext"
15
16PR = "r0"
17
18inherit autotools
19
20BBCLASSEXTEND = "native"