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