* Patchset pending for merging from O.S. Systems tree
@ 2011-02-18 17:43 Otavio Salvador
2011-02-18 17:43 ` [PATCH 01/16] xkeyboard-config: avoid recipe code duplication and depends on intltool-native Otavio Salvador
` (16 more replies)
0 siblings, 17 replies; 21+ messages in thread
From: Otavio Salvador @ 2011-02-18 17:43 UTC (permalink / raw)
To: openembedded-devel
Hello,
Those patches are the ones I sent some days ago, with the requested
fixes and also with the acked-bys already given plus some new ones
that have been cooked here afterwards.
I've done a full build from scratch using those and it seems safe to
get those in. Please ack/nack and push according.
TIA,
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 01/16] xkeyboard-config: avoid recipe code duplication and depends on intltool-native
2011-02-18 17:43 Patchset pending for merging from O.S. Systems tree Otavio Salvador
@ 2011-02-18 17:43 ` Otavio Salvador
2011-02-18 17:43 ` [PATCH 02/16] python-dbus: update to 0.83.2 and fix rpath to use absolute path Otavio Salvador
` (15 subsequent siblings)
16 siblings, 0 replies; 21+ messages in thread
From: Otavio Salvador @ 2011-02-18 17:43 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Khem Raj <raj.khem@gmail.com>
---
recipes/xkeyboard-config/xkeyboard-config.inc | 18 ++++++++++++++++++
recipes/xkeyboard-config/xkeyboard-config_1.4.bb | 18 +++---------------
recipes/xkeyboard-config/xkeyboard-config_1.8.bb | 18 +++---------------
recipes/xkeyboard-config/xkeyboard-config_git.bb | 17 +++--------------
4 files changed, 27 insertions(+), 44 deletions(-)
create mode 100644 recipes/xkeyboard-config/xkeyboard-config.inc
diff --git a/recipes/xkeyboard-config/xkeyboard-config.inc b/recipes/xkeyboard-config/xkeyboard-config.inc
new file mode 100644
index 0000000..b8aab8c
--- /dev/null
+++ b/recipes/xkeyboard-config/xkeyboard-config.inc
@@ -0,0 +1,18 @@
+DESCRIPTION = "Common X11 Keyboard layouts"
+LICENSE = "MIT"
+DEPENDS = "intltool-native xkbcomp-native"
+RDEPENDS_${PN} = "xkbcomp"
+INC_PR = "r6"
+
+SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2"
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+inherit autotools
+
+do_install_append () {
+ install -d ${D}${datadir}/X11/xkb/compiled
+ cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg
+}
+
+FILES_${PN} += "${datadir}/X11/xkb"
diff --git a/recipes/xkeyboard-config/xkeyboard-config_1.4.bb b/recipes/xkeyboard-config/xkeyboard-config_1.4.bb
index 3bca763..d8b9e3f 100644
--- a/recipes/xkeyboard-config/xkeyboard-config_1.4.bb
+++ b/recipes/xkeyboard-config/xkeyboard-config_1.4.bb
@@ -1,20 +1,8 @@
-DESCRIPTION = "Common X11 Keyboard layouts"
-LICENSE = "MIT"
-DEPENDS = "intltool xkbcomp-native"
-RDEPENDS_${PN} = "xkbcomp"
-PR = "r5"
+require xkeyboard-config.inc
-SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2 \
- file://abnt2-fixes.patch"
+PR = "${INC_PR}.0"
-inherit autotools
-
-do_install_append () {
- install -d ${D}/usr/share/X11/xkb/compiled
- cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg
-}
-
-FILES_${PN} += "${datadir}/X11/xkb"
+SRC_URI += "file://abnt2-fixes.patch"
SRC_URI[md5sum] = "a9fe7efbc67a6966c4d4501f0cf88073"
SRC_URI[sha256sum] = "921a857dcf90a59df7feb26da5aabcf0bbfb749c46e2a46c3bc7a0280b83b0e1"
diff --git a/recipes/xkeyboard-config/xkeyboard-config_1.8.bb b/recipes/xkeyboard-config/xkeyboard-config_1.8.bb
index fbf4f1d..fdeb667 100644
--- a/recipes/xkeyboard-config/xkeyboard-config_1.8.bb
+++ b/recipes/xkeyboard-config/xkeyboard-config_1.8.bb
@@ -1,20 +1,8 @@
-DESCRIPTION = "Common X11 Keyboard layouts"
-LICENSE = "MIT"
-DEPENDS = "intltool xkbcomp-native"
-RDEPENDS_${PN} = "xkbcomp"
-PR = "r0"
+require xkeyboard-config.inc
-SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2 \
- file://abnt2-fixes.patch"
+PR = "${INC_PR}.0"
-inherit autotools
-
-do_install_append () {
- install -d ${D}/usr/share/X11/xkb/compiled
- cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg
-}
-
-FILES_${PN} += "${datadir}/X11/xkb"
+SRC_URI += "file://abnt2-fixes.patch"
SRC_URI[md5sum] = "37ae41628cd2ce35d202d30b1820c8ba"
SRC_URI[sha256sum] = "7dc3e6ca00adb105f46e40f8382e83d50b3fcd626bc8654293dae8b1e80506ce"
diff --git a/recipes/xkeyboard-config/xkeyboard-config_git.bb b/recipes/xkeyboard-config/xkeyboard-config_git.bb
index b92bdc1..ac8d03f 100644
--- a/recipes/xkeyboard-config/xkeyboard-config_git.bb
+++ b/recipes/xkeyboard-config/xkeyboard-config_git.bb
@@ -1,20 +1,9 @@
-DESCRIPTION = "Common X11 Keyboard layouts"
-LICENSE = "MIT"
-DEPENDS = "intltool xkbcomp-native"
-RDEPENDS_${PN} = "xkbcomp"
+require xkeyboard-config.inc
+
SRCREV = "547ae8589afb208d7b44ffe1e0ff7aba466c2ee3"
PV = "2.0+gitr${SRCPV}"
-PR = "r0"
+PR = "${INC_PR}.0"
SRC_URI = "git://anongit.freedesktop.org/xkeyboard-config;protocol=git;branch=master"
S = "${WORKDIR}/git"
-
-inherit autotools
-
-do_install_append () {
- install -d ${D}/usr/share/X11/xkb/compiled
- cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg
-}
-
-FILES_${PN} += "${datadir}/X11/xkb"
--
1.7.2.3
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 02/16] python-dbus: update to 0.83.2 and fix rpath to use absolute path
2011-02-18 17:43 Patchset pending for merging from O.S. Systems tree Otavio Salvador
2011-02-18 17:43 ` [PATCH 01/16] xkeyboard-config: avoid recipe code duplication and depends on intltool-native Otavio Salvador
@ 2011-02-18 17:43 ` Otavio Salvador
2011-02-18 17:43 ` [PATCH 03/16] cups: drop unused versions Otavio Salvador
` (14 subsequent siblings)
16 siblings, 0 replies; 21+ messages in thread
From: Otavio Salvador @ 2011-02-18 17:43 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
In case prefix and exec_prefix are empty, rpath can end up with no
absolute paths thus failing to build due a linking issue.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
recipes/python/python-dbus_0.83.0.bb | 29 -----------------------------
recipes/python/python-dbus_0.83.2.bb | 33 +++++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 29 deletions(-)
delete mode 100644 recipes/python/python-dbus_0.83.0.bb
create mode 100644 recipes/python/python-dbus_0.83.2.bb
diff --git a/recipes/python/python-dbus_0.83.0.bb b/recipes/python/python-dbus_0.83.0.bb
deleted file mode 100644
index 9766604..0000000
--- a/recipes/python/python-dbus_0.83.0.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for interprocess communication"
-SECTION = "devel/python"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-LICENSE = "MIT"
-DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native python-epydoc-native"
-PR = "ml2"
-
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
-S = "${WORKDIR}/dbus-python-${PV}"
-
-inherit distutils-base autotools pkgconfig
-
-export BUILD_SYS
-export HOST_SYS
-
-RDEPENDS_${PN} = "\
- python-io \
- python-lang \
- python-logging \
- python-threading \
- python-xml \
-"
-
-FILES_${PN}-dev += "\
- ${libdir}/pkgconfig \
-"
-
-SRC_URI[md5sum] = "562c78876219bf458d79a041af18293d"
-SRC_URI[sha256sum] = "89dd1d5aa5c2ba04677d1aa2616caa50274d8c08f3d6bc164e6f7b9930776191"
diff --git a/recipes/python/python-dbus_0.83.2.bb b/recipes/python/python-dbus_0.83.2.bb
new file mode 100644
index 0000000..7c6eebb
--- /dev/null
+++ b/recipes/python/python-dbus_0.83.2.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for interprocess communication"
+SECTION = "devel/python"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+LICENSE = "MIT"
+DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native python-epydoc-native"
+PR = "ml0"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
+S = "${WORKDIR}/dbus-python-${PV}"
+
+inherit distutils-base autotools pkgconfig
+
+export BUILD_SYS
+export HOST_SYS
+
+RDEPENDS_${PN} = "\
+ python-io \
+ python-lang \
+ python-logging \
+ python-threading \
+ python-xml \
+"
+
+FILES_${PN}-dev += "\
+ ${libdir}/pkgconfig \
+"
+
+do_configure_append() {
+ find ${S} -name Makefile | xargs -n 1 sed -i 's,prefix}lib,prefix}/lib,g'
+}
+
+SRC_URI[md5sum] = "4ebcaa905bdcb4132b915196b0a3691b"
+SRC_URI[sha256sum] = "883729c98f40790021e3be0f7028ae863ee1c4a7b922a5578c1342592adfff64"
--
1.7.2.3
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 03/16] cups: drop unused versions
2011-02-18 17:43 Patchset pending for merging from O.S. Systems tree Otavio Salvador
2011-02-18 17:43 ` [PATCH 01/16] xkeyboard-config: avoid recipe code duplication and depends on intltool-native Otavio Salvador
2011-02-18 17:43 ` [PATCH 02/16] python-dbus: update to 0.83.2 and fix rpath to use absolute path Otavio Salvador
@ 2011-02-18 17:43 ` Otavio Salvador
2011-02-18 17:43 ` [PATCH 04/16] cups: merge cups.inc into cups 1.2.12 recipe Otavio Salvador
` (13 subsequent siblings)
16 siblings, 0 replies; 21+ messages in thread
From: Otavio Salvador @ 2011-02-18 17:43 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
Drop versions not being in use:
- 1.1.23 and 1.2.7 - old and not preferred by any distro
- 1.3.8 and 1.4.3 - D_P -1 and not preferred by any distro
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
---
recipes/cups/cups-1.1.23/strftime_fix.patch | 26 -----
.../cups/cups-1.3.8/use_echo_only_in_init.patch | 11 --
recipes/cups/cups-1.4.3/configure.patch | 117 --------------------
recipes/cups/cups-1.4.3/skip_tools.patch | 51 ---------
.../cups/cups-1.4.3/use_echo_only_in_init.patch | 11 --
recipes/cups/cups_1.1.23.bb | 51 ---------
recipes/cups/cups_1.2.7.bb | 80 -------------
recipes/cups/cups_1.3.8.bb | 11 --
recipes/cups/cups_1.4.3.bb | 15 ---
9 files changed, 0 insertions(+), 373 deletions(-)
delete mode 100644 recipes/cups/cups-1.1.23/strftime_fix.patch
delete mode 100644 recipes/cups/cups-1.3.8/use_echo_only_in_init.patch
delete mode 100644 recipes/cups/cups-1.4.3/configure.patch
delete mode 100644 recipes/cups/cups-1.4.3/skip_tools.patch
delete mode 100644 recipes/cups/cups-1.4.3/use_echo_only_in_init.patch
delete mode 100644 recipes/cups/cups_1.1.23.bb
delete mode 100644 recipes/cups/cups_1.2.7.bb
delete mode 100644 recipes/cups/cups_1.3.8.bb
delete mode 100644 recipes/cups/cups_1.4.3.bb
diff --git a/recipes/cups/cups-1.1.23/strftime_fix.patch b/recipes/cups/cups-1.1.23/strftime_fix.patch
deleted file mode 100644
index 81f224f..0000000
--- a/recipes/cups/cups-1.1.23/strftime_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: cups-1.1.23/scheduler/classes.c
-===================================================================
---- cups-1.1.23.orig/scheduler/classes.c
-+++ cups-1.1.23/scheduler/classes.c
-@@ -622,7 +622,7 @@ SaveAllClasses(void)
-
- curtime = time(NULL);
- curdate = localtime(&curtime);
-- strftime(temp, sizeof(temp) - 1, CUPS_STRFTIME_FORMAT, curdate);
-+ strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
-
- cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
- cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
-Index: cups-1.1.23/scheduler/printers.c
-===================================================================
---- cups-1.1.23.orig/scheduler/printers.c
-+++ cups-1.1.23/scheduler/printers.c
-@@ -1066,7 +1066,7 @@ SaveAllPrinters(void)
-
- curtime = time(NULL);
- curdate = localtime(&curtime);
-- strftime(temp, sizeof(temp) - 1, CUPS_STRFTIME_FORMAT, curdate);
-+ strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
-
- cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
- cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
diff --git a/recipes/cups/cups-1.3.8/use_echo_only_in_init.patch b/recipes/cups/cups-1.3.8/use_echo_only_in_init.patch
deleted file mode 100644
index 21ff0e5..0000000
--- a/recipes/cups/cups-1.3.8/use_echo_only_in_init.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/init/cups.sh.in.orig 2008-10-04 16:50:46.000000000 -0300
-+++ b/init/cups.sh.in 2008-10-04 16:51:39.000000000 -0300
-@@ -68,7 +68,7 @@
- ECHO_ERROR=:
- ;;
-
-- Linux*)
-+ DISABLELinux*)
- IS_ON=/bin/true
- if test -f /etc/init.d/functions; then
- . /etc/init.d/functions
diff --git a/recipes/cups/cups-1.4.3/configure.patch b/recipes/cups/cups-1.4.3/configure.patch
deleted file mode 100644
index 877e8d3..0000000
--- a/recipes/cups/cups-1.4.3/configure.patch
+++ /dev/null
@@ -1,117 +0,0 @@
---- cups-1.4.3/configure.orig 2010-04-08 11:14:19.092296014 +0200
-+++ cups-1.4.3/configure 2010-04-08 11:19:02.661417938 +0200
-@@ -10940,114 +10940,6 @@
- OPTIM="-fPIC $OPTIM"
- fi
-
-- # The -fstack-protector option is available with some versions of
-- # GCC and adds "stack canaries" which detect when the return address
-- # has been overwritten, preventing many types of exploit attacks.
-- { echo "$as_me:$LINENO: checking if GCC supports -fstack-protector" >&5
--echo $ECHO_N "checking if GCC supports -fstack-protector... $ECHO_C" >&6; }
-- OLDCFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS -fstack-protector"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext &&
-- $as_test_x conftest$ac_exeext; then
-- OPTIM="$OPTIM -fstack-protector"
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-- CFLAGS="$OLDCFLAGS"
--
-- # The -pie option is available with some versions of GCC and adds
-- # randomization of addresses, which avoids another class of exploits
-- # that depend on a fixed address for common functions.
-- { echo "$as_me:$LINENO: checking if GCC supports -pie" >&5
--echo $ECHO_N "checking if GCC supports -pie... $ECHO_C" >&6; }
-- OLDCFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS -pie -fPIE"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- PIEFLAGS="-pie -fPIE"
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- CFLAGS="$OLDCFLAGS"
--
- if test "x$with_optim" = x; then
- # Add useful warning options for tracking down problems...
- OPTIM="-Wall -Wno-format-y2k $OPTIM"
diff --git a/recipes/cups/cups-1.4.3/skip_tools.patch b/recipes/cups/cups-1.4.3/skip_tools.patch
deleted file mode 100644
index 2721101..0000000
--- a/recipes/cups/cups-1.4.3/skip_tools.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- cups-1.4.3/ppdc/Makefile.orig 2010-04-07 12:38:56.650327699 +0200
-+++ cups-1.4.3/ppdc/Makefile 2010-04-07 12:40:05.842418876 +0200
-@@ -243,8 +243,8 @@
- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \
- libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \
- $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
-- echo Generating localization strings...
-- ./genstrings >sample.c
-+# echo Generating localization strings...
-+# ./genstrings >sample.c
-
-
- #
-@@ -261,9 +261,9 @@
- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
- ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
- $(COMMONLIBS) $(LIBZ)
-- echo Testing PPD compiler...
-- ./ppdc-static -l en,fr -I ../data foo.drv
-- ./ppdc-static -l en,fr -z -I ../data foo.drv
-+# echo Testing PPD compiler...
-+# ./ppdc-static -l en,fr -I ../data foo.drv
-+# ./ppdc-static -l en,fr -z -I ../data foo.drv
-
-
- #
-@@ -291,15 +291,15 @@
- $(COMMONLIBS) $(LIBZ)
- echo Testing PPD importer...
- $(RM) -r ppd ppd2 sample-import.drv
-- ./ppdc-static -I ../data sample.drv
-- ./ppdi-static -I ../data -o sample-import.drv ppd/*
-- ./ppdc-static -I ../data -d ppd2 sample-import.drv
-- if diff -qr ppd ppd2; then \
-- echo PPD import OK; \
-- else \
-- echo PPD import FAILED; \
-- exit 1; \
-- fi
-+# ./ppdc-static -I ../data sample.drv
-+# ./ppdi-static -I ../data -o sample-import.drv ppd/*
-+# ./ppdc-static -I ../data -d ppd2 sample-import.drv
-+# if diff -qr ppd ppd2; then \
-+# echo PPD import OK; \
-+# else \
-+# echo PPD import FAILED; \
-+# exit 1; \
-+# fi
-
-
- #
diff --git a/recipes/cups/cups-1.4.3/use_echo_only_in_init.patch b/recipes/cups/cups-1.4.3/use_echo_only_in_init.patch
deleted file mode 100644
index 21ff0e5..0000000
--- a/recipes/cups/cups-1.4.3/use_echo_only_in_init.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/init/cups.sh.in.orig 2008-10-04 16:50:46.000000000 -0300
-+++ b/init/cups.sh.in 2008-10-04 16:51:39.000000000 -0300
-@@ -68,7 +68,7 @@
- ECHO_ERROR=:
- ;;
-
-- Linux*)
-+ DISABLELinux*)
- IS_ON=/bin/true
- if test -f /etc/init.d/functions; then
- . /etc/init.d/functions
diff --git a/recipes/cups/cups_1.1.23.bb b/recipes/cups/cups_1.1.23.bb
deleted file mode 100644
index 877187f..0000000
--- a/recipes/cups/cups_1.1.23.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-DESCRIPTION = "An Internet printing system for Unix."
-SECTION = "console/utils"
-LICENSE = "GPL LGPL"
-DEPENDS = "openssl jpeg libpng zlib fakeroot-native"
-INC_PR = "r7"
-PR = "${INC_PR}.1"
-
-SRC_URI = "ftp://ftp3.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
- file://strftime_fix.patch"
-
-inherit autotools binconfig
-
-LDFLAGS += " -L${STAGING_LIBDIR} "
-
-do_compile () {
- #Eeeks! Hack alert!
- grep CUPS config.h.in~ | grep define >> config.h
- sed -i s:STRIP:NOSTRIP: Makedefs
- sed -i s:serial:: backend/Makefile
-
- oe_runmake "SSLLIBS=-lssl -lcrypto -L${STAGING_LIBDIR}" \
- "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \
- "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \
- "LIBZ=-lz -L${STAGING_LIBDIR}" \
- "-I."
-}
-
-fakeroot do_install () {
- oe_runmake "DSTROOT=${D}" install
-}
-
-do_stage () {
- install -d ${STAGING_INCDIR}/cups
- install ${S}/cups/*.h ${STAGING_INCDIR}/cups/
- install ${S}/filter/*.h ${STAGING_INCDIR}/cups/
- oe_libinstall -C cups -so libcups ${STAGING_LIBDIR}
- oe_libinstall -C filter -so libcupsimage ${STAGING_LIBDIR}
-}
-
-#package the html for the webgui inside the main packages (~1MB uncompressed)
-FILES_${PN} += "${datadir}/doc/cups/images \
- ${datadir}/doc/cups/*html \
- ${datadir}/doc/cups/*.css \
- "
-
-
-
-
-
-SRC_URI[md5sum] = "4ce09b1dce09b6b9398af0daae9adf63"
-SRC_URI[sha256sum] = "87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e"
\ No newline at end of file
diff --git a/recipes/cups/cups_1.2.7.bb b/recipes/cups/cups_1.2.7.bb
deleted file mode 100644
index 3f9c120..0000000
--- a/recipes/cups/cups_1.2.7.bb
+++ /dev/null
@@ -1,80 +0,0 @@
-DESCRIPTION = "An Internet printing system for Unix."
-SECTION = "console/utils"
-LICENSE = "GPL LGPL"
-DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib fakeroot-native"
-INC_PR = "r7"
-PR = "${INC_PR}.1"
-
-SRC_URI = "ftp://ftp3.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
- "
-
-inherit autotools binconfig
-
-LDFLAGS += " -L${STAGING_LIBDIR} "
-
-EXTRA_OECONF = " \
- --enable-gnutls \
- --enable-dbus \
- --enable-browsing \
- --disable-openssl \
- --disable-tiff \
- --without-php \
- --without-perl \
- --without-python \
- --without-java \
- "
-
-
-do_configure() {
- gnu-configize
- libtoolize --force
- oe_runconf
-}
-
-do_compile () {
- sed -i s:STRIP:NOSTRIP: Makedefs
- sed -i s:serial:: backend/Makefile
-
- echo "all:" > man/Makefile
- echo "install:" >> man/Makefile
-
- oe_runmake "SSLLIBS=-lgnutls -L${STAGING_LIBDIR}" \
- "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \
- "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \
- "LIBZ=-lz -L${STAGING_LIBDIR}" \
- "-I."
-}
-
-fakeroot do_install () {
- oe_runmake "DSTROOT=${D}" install
-}
-
-do_stage () {
- install -d ${STAGING_INCDIR}/cups
- install ${S}/cups/*.h ${STAGING_INCDIR}/cups/
- install ${S}/filter/*.h ${STAGING_INCDIR}/cups/
- oe_libinstall -C cups -so libcups ${STAGING_LIBDIR}
- oe_libinstall -C filter -so libcupsimage ${STAGING_LIBDIR}
-}
-
-FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \
- ${libdir}/cups/cgi-bin/.debug \
- ${libdir}/cups/filter/.debug \
- ${libdir}/cups/monitor/.debug \
- ${libdir}/cups/notifier/.debug \
- ${libdir}/cups/daemon/.debug \
- "
-#package the html for the webgui inside the main packages (~1MB uncompressed)
-
-FILES_${PN} += "${datadir}/doc/cups/images \
- ${datadir}/doc/cups/*html \
- ${datadir}/doc/cups/*.css \
- ${datadir}/icons/ \
- "
-
-
-
-
-
-SRC_URI[md5sum] = "bf44783d9b46130bee9f2995e6055470"
-SRC_URI[sha256sum] = "e7485d6b3dcbd338a2361aff66c516f8dfafc1c81ea5b01396f6ee5f365c4eb3"
\ No newline at end of file
diff --git a/recipes/cups/cups_1.3.8.bb b/recipes/cups/cups_1.3.8.bb
deleted file mode 100644
index fd37246..0000000
--- a/recipes/cups/cups_1.3.8.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require cups.inc
-
-SRC_URI += "file://use_echo_only_in_init.patch"
-PR = "${INC_PR}.1"
-
-DEFAULT_PREFERENCE = "-1"
-
-EXTRA_OECONF += " --disable-gssapi "
-
-SRC_URI[md5sum] = "90ed7449948994ad1b22b0b177ab6ba6"
-SRC_URI[sha256sum] = "d488980f84ad0e6044a67859144306980624cafb654eb0cab071b3e46fee6e1d"
diff --git a/recipes/cups/cups_1.4.3.bb b/recipes/cups/cups_1.4.3.bb
deleted file mode 100644
index f562725..0000000
--- a/recipes/cups/cups_1.4.3.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require cups14.inc
-
-SRC_URI += "file://use_echo_only_in_init.patch \
- file://skip_tools.patch \
- file://configure.patch \
- "
-
-SRC_URI[md5sum] = "e70b1c3f60143d7310c1d74c111a21ab"
-SRC_URI[sha256sum] = "47a559b1c50192b94479ae7dab132ea0008727045d4993501cf0a6df0c64db97"
-
-PR = "r3"
-
-DEFAULT_PREFERENCE = "-1"
-
-EXTRA_OECONF += " --disable-gssapi --disable-largefile --enable-debug --disable-relro "
--
1.7.2.3
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 04/16] cups: merge cups.inc into cups 1.2.12 recipe
2011-02-18 17:43 Patchset pending for merging from O.S. Systems tree Otavio Salvador
` (2 preceding siblings ...)
2011-02-18 17:43 ` [PATCH 03/16] cups: drop unused versions Otavio Salvador
@ 2011-02-18 17:43 ` Otavio Salvador
2011-02-18 17:43 ` [PATCH 05/16] cups: merge cups14.inc into cups 1.4.4 recipe Otavio Salvador
` (12 subsequent siblings)
16 siblings, 0 replies; 21+ messages in thread
From: Otavio Salvador @ 2011-02-18 17:43 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
---
recipes/cups/cups.inc | 89 -----------------------------------------
recipes/cups/cups_1.2.12.bb | 92 +++++++++++++++++++++++++++++++++++++++++-
2 files changed, 89 insertions(+), 92 deletions(-)
delete mode 100644 recipes/cups/cups.inc
diff --git a/recipes/cups/cups.inc b/recipes/cups/cups.inc
deleted file mode 100644
index 0c7b103..0000000
--- a/recipes/cups/cups.inc
+++ /dev/null
@@ -1,89 +0,0 @@
-DESCRIPTION = "An Internet printing system for Unix."
-SECTION = "console/utils"
-LICENSE = "GPL LGPL"
-DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib fakeroot-native"
-
-INC_PR = "r7"
-
-SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
- "
-
-inherit autotools binconfig
-
-EXTRA_OECONF = " \
- --enable-gnutls \
- --enable-dbus \
- --enable-browsing \
- --disable-openssl \
- --disable-tiff \
- --disable-ssl \
- --without-php \
- --without-perl \
- --without-python \
- --without-java \
- "
-
-
-do_configure() {
- export DSOFLAGS="${LDFLAGS}"
- gnu-configize
- libtoolize --force
- oe_runconf
-}
-
-do_compile () {
- sed -i s:STRIP:NOSTRIP: Makedefs
- sed -i s:serial:: backend/Makefile
-
- echo "all:" > man/Makefile
- echo "install:" >> man/Makefile
-
- oe_runmake "SSLLIBS=-lgnutls -L${STAGING_LIBDIR}" \
- "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \
- "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \
- "LIBZ=-lz -L${STAGING_LIBDIR}" \
- "-I."
-}
-
-fakeroot do_install () {
- oe_runmake "DSTROOT=${D}" install
-
- # This directory gets installed with perms 511, which makes packaging fail
- chmod 0711 "${D}/${localstatedir}/run/cups/certs"
-}
-
-python do_package_append() {
- # Change permissions back the way they were, they probably had a reason...
- pkgdest = bb.data.getVar('PKGDEST', d, 1)
- os.system('chmod 0511 %s/cups/var/run/cups/certs' % pkgdest)
-}
-
-SYSROOT_PREPROCESS_FUNCS += "cups_config_mangle"
-
-cups_config_mangle() {
- # Undo mangle of cups_datadir and cups_serverbin
- sed -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:g' \
- -e 's:cups_serverbin=.*:cups_serverbin=${libdir}/cups:g' \
- -i ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/cups-config
-}
-
-PACKAGES =+ "${PN}-lib ${PN}-libimage"
-
-FILES_${PN}-lib = "${libdir}/libcups.so.*"
-
-FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*"
-
-FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \
- ${libdir}/cups/cgi-bin/.debug \
- ${libdir}/cups/filter/.debug \
- ${libdir}/cups/monitor/.debug \
- ${libdir}/cups/notifier/.debug \
- ${libdir}/cups/daemon/.debug \
- "
-#package the html for the webgui inside the main packages (~1MB uncompressed)
-
-FILES_${PN} += "${datadir}/doc/cups/images \
- ${datadir}/doc/cups/*html \
- ${datadir}/doc/cups/*.css \
- ${datadir}/icons/ \
- "
diff --git a/recipes/cups/cups_1.2.12.bb b/recipes/cups/cups_1.2.12.bb
index 167d353..1b06a53 100644
--- a/recipes/cups/cups_1.2.12.bb
+++ b/recipes/cups/cups_1.2.12.bb
@@ -1,7 +1,93 @@
-require cups.inc
-PR = "${INC_PR}.3"
+DESCRIPTION = "An Internet printing system for Unix."
+SECTION = "console/utils"
+LICENSE = "GPL LGPL"
+DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib fakeroot-native"
-SRC_URI += "file://0001-cups-desktop-fix-cups-desktop-file.patch"
+PR = "r8"
+
+SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
+ file://0001-cups-desktop-fix-cups-desktop-file.patch \
+ "
+
+inherit autotools binconfig
+
+EXTRA_OECONF = " \
+ --enable-gnutls \
+ --enable-dbus \
+ --enable-browsing \
+ --disable-openssl \
+ --disable-tiff \
+ --disable-ssl \
+ --without-php \
+ --without-perl \
+ --without-python \
+ --without-java \
+ "
+
+
+do_configure() {
+ export DSOFLAGS="${LDFLAGS}"
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+}
+
+do_compile () {
+ sed -i s:STRIP:NOSTRIP: Makedefs
+ sed -i s:serial:: backend/Makefile
+
+ echo "all:" > man/Makefile
+ echo "install:" >> man/Makefile
+
+ oe_runmake "SSLLIBS=-lgnutls -L${STAGING_LIBDIR}" \
+ "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \
+ "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \
+ "LIBZ=-lz -L${STAGING_LIBDIR}" \
+ "-I."
+}
+
+fakeroot do_install () {
+ oe_runmake "DSTROOT=${D}" install
+
+ # This directory gets installed with perms 511, which makes packaging fail
+ chmod 0711 "${D}/${localstatedir}/run/cups/certs"
+}
+
+python do_package_append() {
+ # Change permissions back the way they were, they probably had a reason...
+ pkgdest = bb.data.getVar('PKGDEST', d, 1)
+ os.system('chmod 0511 %s/cups/var/run/cups/certs' % pkgdest)
+}
+
+SYSROOT_PREPROCESS_FUNCS += "cups_config_mangle"
+
+cups_config_mangle() {
+ # Undo mangle of cups_datadir and cups_serverbin
+ sed -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:g' \
+ -e 's:cups_serverbin=.*:cups_serverbin=${libdir}/cups:g' \
+ -i ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/cups-config
+}
+
+PACKAGES =+ "${PN}-lib ${PN}-libimage"
+
+FILES_${PN}-lib = "${libdir}/libcups.so.*"
+
+FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*"
+
+FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \
+ ${libdir}/cups/cgi-bin/.debug \
+ ${libdir}/cups/filter/.debug \
+ ${libdir}/cups/monitor/.debug \
+ ${libdir}/cups/notifier/.debug \
+ ${libdir}/cups/daemon/.debug \
+ "
+#package the html for the webgui inside the main packages (~1MB uncompressed)
+
+FILES_${PN} += "${datadir}/doc/cups/images \
+ ${datadir}/doc/cups/*html \
+ ${datadir}/doc/cups/*.css \
+ ${datadir}/icons/ \
+ "
SRC_URI[md5sum] = "d410658468384b5ba5d04a808f6157fe"
SRC_URI[sha256sum] = "b4ff8e934da7db32d5654360ea9068faa0ed5a00fde02161ae53c2052510d00f"
--
1.7.2.3
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 05/16] cups: merge cups14.inc into cups 1.4.4 recipe
2011-02-18 17:43 Patchset pending for merging from O.S. Systems tree Otavio Salvador
` (3 preceding siblings ...)
2011-02-18 17:43 ` [PATCH 04/16] cups: merge cups.inc into cups 1.2.12 recipe Otavio Salvador
@ 2011-02-18 17:43 ` Otavio Salvador
2011-02-18 17:43 ` [PATCH 06/16] cups: add textonly filter and split packages Otavio Salvador
` (11 subsequent siblings)
16 siblings, 0 replies; 21+ messages in thread
From: Otavio Salvador @ 2011-02-18 17:43 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
---
recipes/cups/cups14.inc | 83 --------------------------------------
recipes/cups/cups_1.4.4.bb | 96 +++++++++++++++++++++++++++++++++++++++-----
2 files changed, 85 insertions(+), 94 deletions(-)
delete mode 100644 recipes/cups/cups14.inc
diff --git a/recipes/cups/cups14.inc b/recipes/cups/cups14.inc
deleted file mode 100644
index 0828187..0000000
--- a/recipes/cups/cups14.inc
+++ /dev/null
@@ -1,83 +0,0 @@
-DESCRIPTION = "An Internet printing system for Unix."
-SECTION = "console/utils"
-LICENSE = "GPL LGPL"
-DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib fakeroot-native"
-PROVIDES = "cups14"
-
-SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2"
-
-LEAD_SONAME = "libcupsdriver.so"
-
-inherit autotools binconfig
-
-EXTRA_OECONF = " \
- --enable-gnutls \
- --enable-dbus \
- --enable-browsing \
- --disable-openssl \
- --disable-tiff \
- --without-php \
- --without-perl \
- --without-python \
- --without-java \
- "
-
-
-do_configure() {
- gnu-configize
- libtoolize --force
- DSOFLAGS="${LDFLAGS}" oe_runconf
-}
-
-do_compile () {
- sed -i s:STRIP:NOSTRIP: Makedefs
- sed -i s:serial:: backend/Makefile
-
- echo "all:" > man/Makefile
- echo "libs:" >> man/Makefile
- echo "install:" >> man/Makefile
- echo "install-data:" >> man/Makefile
- echo "install-exec:" >> man/Makefile
- echo "install-headers:" >> man/Makefile
- echo "install-libs:" >> man/Makefile
-
- oe_runmake "SSLLIBS=-lgnutls -L${STAGING_LIBDIR}" \
- "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \
- "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \
- "LIBZ=-lz -L${STAGING_LIBDIR}" \
- "-I."
-}
-
-fakeroot do_install () {
- oe_runmake "DSTROOT=${D}" install
-
- # This directory gets installed with perms 511, which makes packaging fail
- chmod 0711 "${D}/${localstatedir}/run/cups/certs"
-}
-
-python do_package_append() {
- # Change permissions back the way they were, they probably had a reason...
- workdir = bb.data.getVar('WORKDIR', d, 1)
- os.system('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir)
-}
-
-PACKAGES =+ "${PN}-lib ${PN}-libimage"
-
-FILES_${PN}-lib = "${libdir}/libcups.so.*"
-
-FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*"
-
-FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \
- ${libdir}/cups/cgi-bin/.debug \
- ${libdir}/cups/filter/.debug \
- ${libdir}/cups/monitor/.debug \
- ${libdir}/cups/notifier/.debug \
- ${libdir}/cups/daemon/.debug \
- "
-#package the html for the webgui inside the main packages (~1MB uncompressed)
-
-FILES_${PN} += "${datadir}/doc/cups/images \
- ${datadir}/doc/cups/*html \
- ${datadir}/doc/cups/*.css \
- ${datadir}/icons/ \
- "
diff --git a/recipes/cups/cups_1.4.4.bb b/recipes/cups/cups_1.4.4.bb
index bf23cc5..709edf1 100644
--- a/recipes/cups/cups_1.4.4.bb
+++ b/recipes/cups/cups_1.4.4.bb
@@ -1,17 +1,91 @@
-require cups14.inc
-
-SRC_URI += " \
- file://use_echo_only_in_init.patch \
- file://skip_tools.patch \
- file://configure.patch \
- "
+#package the html for the webgui inside the main packages (~1MB uncompressed)
+DESCRIPTION = "An Internet printing system for Unix."
+SECTION = "console/utils"
+LICENSE = "GPL LGPL"
+DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib fakeroot-native"
+DEPENDS += "virtual/libusb0"
+PROVIDES = "cups14"
+PR = "r3"
+SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
+ file://use_echo_only_in_init.patch \
+ file://skip_tools.patch \
+ file://configure.patch \
+ "
SRC_URI[md5sum] = "8776403ad60fea9e85eab9c04d88560d"
SRC_URI[sha256sum] = "d25ffa35add3abeeec0eba60be2cffc89425b649c64ef3a73dfc724683a59aa3"
-PR = "r2"
-
DEFAULT_PREFERENCE = "-1"
-DEPENDS += "virtual/libusb0"
-EXTRA_OECONF += " --disable-gssapi --disable-largefile --enable-debug --disable-relro --enable-libusb"
+
+inherit autotools binconfig
+
+EXTRA_OECONF = "--enable-gnutls \
+ --enable-dbus \
+ --enable-browsing \
+ --disable-openssl \
+ --disable-tiff \
+ --without-php \
+ --without-perl \
+ --without-python \
+ --without-java \
+ --disable-gssapi \
+ --disable-largefile \
+ --enable-debug \
+ --disable-relro \
+ --enable-libusb \
+ "
+
+do_configure() {
+ gnu-configize
+ libtoolize --force
+ DSOFLAGS="${LDFLAGS}" oe_runconf
+}
+do_compile () {
+ sed -i s:STRIP:NOSTRIP: Makedefs
+ sed -i s:serial:: backend/Makefile
+ echo "all:" > man/Makefile
+ echo "libs:" >> man/Makefile
+ echo "install:" >> man/Makefile
+ echo "install-data:" >> man/Makefile
+ echo "install-exec:" >> man/Makefile
+ echo "install-headers:" >> man/Makefile
+ echo "install-libs:" >> man/Makefile
+ oe_runmake "SSLLIBS=-lgnutls -L${STAGING_LIBDIR}" \
+ "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \
+ "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \
+ "LIBZ=-lz -L${STAGING_LIBDIR}" \
+ "-I."
+}
+
+PACKAGES =+ "${PN}-lib ${PN}-libimage"
+
+FILES_${PN}-lib = "${libdir}/libcups.so.*"
+FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*"
+FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \
+ ${libdir}/cups/cgi-bin/.debug \
+ ${libdir}/cups/filter/.debug \
+ ${libdir}/cups/monitor/.debug \
+ ${libdir}/cups/notifier/.debug \
+ ${libdir}/cups/daemon/.debug \
+ "
+FILES_${PN} += "${datadir}/doc/cups/images \
+ ${datadir}/doc/cups/*html \
+ ${datadir}/doc/cups/*.css \
+ ${datadir}/icons/ \
+ "
+
CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf"
+
+LEAD_SONAME = "libcupsdriver.so"
+
+fakeroot do_install () {
+ oe_runmake "DSTROOT=${D}" install
+ # This directory gets installed with perms 511, which makes packaging fail
+ chmod 0711 "${D}/${localstatedir}/run/cups/certs"
+}
+
+python do_package_append() {
+ # Change permissions back the way they were, they probably had a reason...
+ workdir = bb.data.getVar('WORKDIR', d, 1)
+ os.system('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir)
+}
--
1.7.2.3
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 06/16] cups: add textonly filter and split packages
2011-02-18 17:43 Patchset pending for merging from O.S. Systems tree Otavio Salvador
` (4 preceding siblings ...)
2011-02-18 17:43 ` [PATCH 05/16] cups: merge cups14.inc into cups 1.4.4 recipe Otavio Salvador
@ 2011-02-18 17:43 ` Otavio Salvador
2011-02-18 17:43 ` [PATCH 07/16] libinih: add Otavio Salvador
` (10 subsequent siblings)
16 siblings, 0 replies; 21+ messages in thread
From: Otavio Salvador @ 2011-02-18 17:43 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
---
recipes/cups/cups-1.4.4/text.convs | 6 ++
recipes/cups/cups-1.4.4/textonly | 124 ++++++++++++++++++++++++++++++++++
recipes/cups/cups-1.4.4/textonly.ppd | 47 +++++++++++++
recipes/cups/cups_1.4.4.bb | 30 ++++++++-
4 files changed, 205 insertions(+), 2 deletions(-)
create mode 100644 recipes/cups/cups-1.4.4/text.convs
create mode 100644 recipes/cups/cups-1.4.4/textonly
create mode 100644 recipes/cups/cups-1.4.4/textonly.ppd
diff --git a/recipes/cups/cups-1.4.4/text.convs b/recipes/cups/cups-1.4.4/text.convs
new file mode 100644
index 0000000..20a845d
--- /dev/null
+++ b/recipes/cups/cups-1.4.4/text.convs
@@ -0,0 +1,6 @@
+application/x-cshell text/plain 100 -
+application/x-csource text/plain 100 -
+application/x-perl text/plain 100 -
+application/x-shell text/plain 100 -
+text/html text/plain 100 -
+text/css text/plain 100 -
diff --git a/recipes/cups/cups-1.4.4/textonly b/recipes/cups/cups-1.4.4/textonly
new file mode 100644
index 0000000..25850cc
--- /dev/null
+++ b/recipes/cups/cups-1.4.4/textonly
@@ -0,0 +1,124 @@
+#!/bin/bash
+## Copyright (C) 2003-2006 Red Hat, Inc.
+## Copyright (C) 2003-2006 Tim Waugh <twaugh@redhat.com>
+## Changed on 2007/05/17, Opher Shachar, LADPC Ltd.
+## Added support for page-ranges option.
+## Added page accounting.
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+if [ $# == 0 ]; then
+ echo >&2 "ERROR: $0 job-id user title copies options [file]"
+ exit 1
+fi
+
+# Extract the papersize
+SENDFF=`grep '^\*DefaultSendFF' "$PPD" | cut -d\ -f2`
+COPIES=1
+if [ $# -ge 4 ]; then
+ COPIES="$4"
+fi
+
+if [ "$COPIES" -gt 1 ] && [ $# -lt 6 ]; then
+ unset TMPFILE
+ trap -- 'rm -f "$TMPFILE"' EXIT
+ TMPFILE=$(mktemp ${TMPDIR:-/tmp}/textonly.XXXXXX)
+ cat > "$TMPFILE"
+else
+ TMPFILE="$6"
+fi
+
+PR=${5#*page-ranges=}
+# Do options specify page-ranges?
+if [[ "$PR" != "$5" ]]; then
+ PR=${PR%% *}
+else
+ #unset PR
+ PR=1-999999
+fi
+
+if [[ "$PR" ]]; then
+ TMPFILE2=$(mktemp ${TMPDIR:-/tmp}/textonly2.XXXXXX)
+ pagenum=0
+ EOF=
+ {
+ while [[ "$PR" ]]; do
+ pl=${PR%%,*} ;# take first subrange
+ PR=${PR#$pl};PR=${PR#,} ;# remove from range list
+ pu=${pl#*-} ;# extract upper and lower
+ pl=${pl%-*} ;# pages of subrange
+ # Allows interpreting 0-5,3-10 as 1-5,6-10 rejects 5-1 or 1-
+ (( pagenum >= pl )) && pl=$(( pagenum + 1 ))
+ (( pl > pu )) && continue
+
+ # Loop reading pages until at or over lower page of subrange.
+ while read -d `echo -ne '\f'` -r; do
+ (( pagenum++ ))
+ (( pagenum == pl )) && break
+ done
+ # Did we reach lower page of subrange or EOF?
+ if (( pagenum < pl )); then
+ [[ ! "$REPLY" ]] && break ;# empty last page - we're done.
+ (( pagenum++ ))
+ EOF=y
+ fi
+ # Output page and report to page log
+ if (( pagenum == pl )); then
+ echo -n "${REPLY}" >>"$TMPFILE2"
+ # If EOF then page has no final FF
+ [[ ! "$EOF" ]] && echo -ne '\f' >>"$TMPFILE2"
+ echo "PAGE: $pagenum $COPIES" >&2
+ fi
+ [[ "$EOF" ]] && break
+ # Is the current subrange a single page?
+ (( pagenum == pu )) && continue
+ while read -d `echo -ne '\f'` -r; do
+ (( pagenum++ ))
+ echo -ne "${REPLY}\f" >>"$TMPFILE2"
+ echo "PAGE: $pagenum $COPIES" >&2
+ (( pagenum == pu )) && break
+ done
+ # Could be that we reached EOF before page boundry
+ if (( pagenum < pu )); then
+ if [[ "$REPLY" ]]; then
+ (( pagenum++ ))
+ echo -n "${REPLY}" >>"$TMPFILE2"
+ echo "PAGE: $pagenum $COPIES" >&2
+ fi
+ break
+ fi
+ done
+ } <"$TMPFILE"
+else
+ TMPFILE2="$TMPFILE"
+ pc=$(grep -co `echo -ne '\f'` "$TMPFILE2")
+ pc=$(( pc * $COPIES ))
+ echo "PAGE: $pc" >&2
+fi
+
+while [ "$COPIES" -gt 0 ]; do
+ # Just translate LF->CRLF at the moment, until the PPD has options added.
+ sed -e 's/$/'`echo -ne '\r'`'/g' "$TMPFILE2"
+
+ if [ "$SENDFF" == "True" ]
+ then
+ echo -ne \\14
+ fi
+
+ COPIES=$(($COPIES - 1))
+done
+# Cleanup
+[[ "$TMPFILE" != "$TMPFILE2" ]] && rm -f "$TMPFILE2"
+exit 0
diff --git a/recipes/cups/cups-1.4.4/textonly.ppd b/recipes/cups/cups-1.4.4/textonly.ppd
new file mode 100644
index 0000000..89060bc
--- /dev/null
+++ b/recipes/cups/cups-1.4.4/textonly.ppd
@@ -0,0 +1,47 @@
+*PPD-Adobe: "4.3"
+*%
+*% Text-only printer definition
+*%
+*FormatVersion: "4.3"
+*FileVersion: "1.1"
+*LanguageVersion: English
+*LanguageEncoding: ISOLatin1
+*PCFileName: "TEXTONLY.PPD"
+*Manufacturer: "Generic"
+*Product: "(Generic)"
+*cupsVersion: 1.0
+*cupsManualCopies: True
+*cupsModelNumber: 2
+*cupsFilter: "text/plain 0 textonly"
+*ModelName: "Generic text-only printer"
+*ShortNickName: "Generic text-only printer"
+*NickName: "Generic text-only printer"
+*PSVersion: "(2017.000) 0"
+*LanguageLevel: "2"
+*ColorDevice: False
+*DefaultColorSpace: Gray
+*FileSystem: False
+*Throughput: "8"
+*LandscapeOrientation: Plus90
+*VariablePaperSize: False
+*TTRasterizer: Type42
+*DefaultImageableArea: Letter
+*ImageableArea Letter/US Letter: "18 36 594 756"
+*DefaultPaperDimension: Letter
+*PaperDimension Letter/Letter: "612 792"
+*OpenUI *PageSize/Media Size: PickOne
+*OrderDependency: 10 AnySetup *PageSize
+*DefaultPageSize: Letter
+*PageSize Letter/Letter: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
+*CloseUI: *PageSize
+*OpenUI *PageRegion: PickOne
+*OrderDependency: 10 AnySetup *PageRegion
+*DefaultPageRegion: Letter
+*PageRegion Letter/Letter: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
+*CloseUI: *PageRegion
+
+*OpenUI *SendFF: Boolean
+*DefaultSendFF: False
+*SendFF True/True: ""
+*SendFF False/False: ""
+*CloseUI: *SendFF
diff --git a/recipes/cups/cups_1.4.4.bb b/recipes/cups/cups_1.4.4.bb
index 709edf1..c469dae 100644
--- a/recipes/cups/cups_1.4.4.bb
+++ b/recipes/cups/cups_1.4.4.bb
@@ -5,12 +5,15 @@ LICENSE = "GPL LGPL"
DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib fakeroot-native"
DEPENDS += "virtual/libusb0"
PROVIDES = "cups14"
-PR = "r3"
+PR = "r4"
SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
file://use_echo_only_in_init.patch \
file://skip_tools.patch \
file://configure.patch \
+ file://textonly.ppd \
+ file://textonly \
+ file://text.convs \
"
SRC_URI[md5sum] = "8776403ad60fea9e85eab9c04d88560d"
SRC_URI[sha256sum] = "d25ffa35add3abeeec0eba60be2cffc89425b649c64ef3a73dfc724683a59aa3"
@@ -57,10 +60,24 @@ do_compile () {
"-I."
}
-PACKAGES =+ "${PN}-lib ${PN}-libimage"
+PACKAGES =+ "${PN}-lib ${PN}-libimage ${PN}-filter-textonly ${PN}-filters ${PN}-models"
+
+PACKAGES_DYNAMIC += "${PN}-backend-*"
+
+python populate_packages_prepend() {
+ backend_dir = bb.data.expand('${libdir}/cups/backend/', d)
+ do_split_packages(d, backend_dir, '^(.*)$', 'cups-backend-%s',
+ '${PN} backend for %s', prepend=True, allow_links=True)
+}
FILES_${PN}-lib = "${libdir}/libcups.so.*"
FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*"
+FILES_${PN}-filter-textonly += "${datadir}/ppd/cups-included/textonly.ppd \
+ ${datadir}/cups/mime/text.convs \
+ ${libdir}/cups/filter/textonly \
+ "
+FILES_${PN}-filters += "${libdir}/cups/filter/*"
+FILES_${PN}-models += "${datadir}/cups/model/*"
FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \
${libdir}/cups/cgi-bin/.debug \
${libdir}/cups/filter/.debug \
@@ -82,6 +99,15 @@ fakeroot do_install () {
oe_runmake "DSTROOT=${D}" install
# This directory gets installed with perms 511, which makes packaging fail
chmod 0711 "${D}/${localstatedir}/run/cups/certs"
+
+ install -d ${D}/${libdir}/cups/filter
+ install -m 755 ${WORKDIR}/textonly ${D}/${libdir}/cups/filter
+
+ install -d ${D}/${datadir}/cups/mime
+ install -m 644 ${WORKDIR}/text.convs ${D}/${datadir}/cups/mime
+
+ install -d ${D}/${datadir}/ppd/cups-included
+ install -m 644 ${WORKDIR}/textonly.ppd ${D}/${datadir}/ppd/cups-included
}
python do_package_append() {
--
1.7.2.3
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 07/16] libinih: add
2011-02-18 17:43 Patchset pending for merging from O.S. Systems tree Otavio Salvador
` (5 preceding siblings ...)
2011-02-18 17:43 ` [PATCH 06/16] cups: add textonly filter and split packages Otavio Salvador
@ 2011-02-18 17:43 ` Otavio Salvador
2011-02-20 9:37 ` Frans Meulenbroeks
2011-02-18 17:43 ` [PATCH 08/16] sdk.bbclass: cache ${libdir} as ${target_libdir} Otavio Salvador
` (9 subsequent siblings)
16 siblings, 1 reply; 21+ messages in thread
From: Otavio Salvador @ 2011-02-18 17:43 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
This provides a C and C++ INI library that can be statically linked
into projects.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Khem Raj <raj.khem@gmail.com>
---
recipes/libinih/libinih_git.bb | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
create mode 100644 recipes/libinih/libinih_git.bb
diff --git a/recipes/libinih/libinih_git.bb b/recipes/libinih/libinih_git.bb
new file mode 100644
index 0000000..e9f811f
--- /dev/null
+++ b/recipes/libinih/libinih_git.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "C and C++ INI Library"
+PRIORITY = "optional"
+PV = "0.0+gitr${SRCPV}"
+PKGV = "${GITPKGVTAG}"
+PR = "r0"
+LICENSE = "BSD"
+RDEPENDS_${PN}-dev = ""
+
+SRCREV = "${AUTOREV}"
+SRC_URI = "git://projetos.ossystems.com.br/git/libinih.git;protocol=git"
+
+S = "${WORKDIR}/git"
+
+inherit gitpkgv cmake
--
1.7.2.3
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 08/16] sdk.bbclass: cache ${libdir} as ${target_libdir}
2011-02-18 17:43 Patchset pending for merging from O.S. Systems tree Otavio Salvador
` (6 preceding siblings ...)
2011-02-18 17:43 ` [PATCH 07/16] libinih: add Otavio Salvador
@ 2011-02-18 17:43 ` Otavio Salvador
2011-02-18 17:43 ` [PATCH 09/16] qt4-tools-sdk: use host include headers for dbus Otavio Salvador
` (8 subsequent siblings)
16 siblings, 0 replies; 21+ messages in thread
From: Otavio Salvador @ 2011-02-18 17:43 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
classes/sdk.bbclass | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass
index 4fe17b8..bf77744 100644
--- a/classes/sdk.bbclass
+++ b/classes/sdk.bbclass
@@ -7,6 +7,7 @@
# or indirectly via dependency. No need to be in 'world'.
EXCLUDE_FROM_WORLD = "1"
target_includedir := "${includedir}"
+target_libdir := "${libdir}"
# Save MULTIMACH_ARCH
OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}"
--
1.7.2.3
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 09/16] qt4-tools-sdk: use host include headers for dbus
2011-02-18 17:43 Patchset pending for merging from O.S. Systems tree Otavio Salvador
` (7 preceding siblings ...)
2011-02-18 17:43 ` [PATCH 08/16] sdk.bbclass: cache ${libdir} as ${target_libdir} Otavio Salvador
@ 2011-02-18 17:43 ` Otavio Salvador
2011-02-18 17:43 ` [PATCH 10/16] qmake_base.bbclass: add generate_qt_config_file task Otavio Salvador
` (7 subsequent siblings)
16 siblings, 0 replies; 21+ messages in thread
From: Otavio Salvador @ 2011-02-18 17:43 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Khem Raj <raj.khem@gmail.com>
---
recipes/qt4/qt4-tools-sdk.inc | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/recipes/qt4/qt4-tools-sdk.inc b/recipes/qt4/qt4-tools-sdk.inc
index ad896e4..bd70046 100644
--- a/recipes/qt4/qt4-tools-sdk.inc
+++ b/recipes/qt4/qt4-tools-sdk.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com"
PRIORITY = "optional"
LICENSE = "LGPLv2.1 GPLv3"
-INC_PR = "r2"
+INC_PR = "r3"
FILESPATHPKG =. "qt-${PV}:"
inherit sdk
@@ -32,9 +32,9 @@ EXTRA_OECONF = "-prefix ${prefix} \
-verbose -release -fast -static \
-embedded -no-freetype -no-glib -no-iconv \
-qt3support \
- -I${STAGING_DIR_NATIVE}/usr/include \
- -I${STAGING_DIR_NATIVE}/usr/include/dbus-1.0 \
- -I${STAGING_DIR_NATIVE}/usr/lib/dbus-1.0/include"
+ -I${STAGING_DIR}/${HOST_SYS}${target_includedir} \
+ -I${STAGING_DIR}/${HOST_SYS}${target_includedir}/dbus-1.0 \
+ -I${STAGING_DIR}/${HOST_SYS}${target_libdir}/dbus-1.0/include"
# yank default -e, otherwise we get the following error:
# moc_qbuffer.cpp: No such file or directory
--
1.7.2.3
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 10/16] qmake_base.bbclass: add generate_qt_config_file task
2011-02-18 17:43 Patchset pending for merging from O.S. Systems tree Otavio Salvador
` (8 preceding siblings ...)
2011-02-18 17:43 ` [PATCH 09/16] qt4-tools-sdk: use host include headers for dbus Otavio Salvador
@ 2011-02-18 17:43 ` Otavio Salvador
2011-02-18 17:43 ` [PATCH 11/16] cmake: drop 2.6.4 as it is not used by any distro Otavio Salvador
` (6 subsequent siblings)
16 siblings, 0 replies; 21+ messages in thread
From: Otavio Salvador @ 2011-02-18 17:43 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
This writes a qt.conf inside WORKDIR to properly configure projects
based on CMake. This is required since qmake variables (returned by
-query command) are fixed into the binary and can only be changed
using a qt.conf file.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
classes/qmake_base.bbclass | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/classes/qmake_base.bbclass b/classes/qmake_base.bbclass
index cf905a7..cc3297c 100644
--- a/classes/qmake_base.bbclass
+++ b/classes/qmake_base.bbclass
@@ -34,6 +34,20 @@ oe_qmake_mkspecs () {
done
}
+do_generate_qt_config_file() {
+ export QT_CONF_PATH=${WORKDIR}/qt.conf
+ cat > ${WORKDIR}/qt.conf <<EOF
+[Paths]
+Prefix = ${STAGING_DIR}
+Binaries = ${BUILD_SYS}${bindir_native}
+Headers = ${BASEPKG_HOST_SYS}${layout_prefix}/include/qt4
+Plugins = ${BASEPKG_HOST_SYS}${layout_prefix}/lib/qt4/plugins/
+Mkspecs = ${BASEPKG_HOST_SYS}${layout_prefix}/share/qt4/mkspecs/
+EOF
+}
+
+addtask generate_qt_config_file after do_patch before do_configure
+
qmake_base_do_configure() {
case ${QMAKESPEC} in
*linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++|*linux-uclibceabi-oe-g++|*linux-gnuspe-oe-g++|*linux-uclibcspe-oe-g++)
--
1.7.2.3
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 11/16] cmake: drop 2.6.4 as it is not used by any distro
2011-02-18 17:43 Patchset pending for merging from O.S. Systems tree Otavio Salvador
` (9 preceding siblings ...)
2011-02-18 17:43 ` [PATCH 10/16] qmake_base.bbclass: add generate_qt_config_file task Otavio Salvador
@ 2011-02-18 17:43 ` Otavio Salvador
2011-02-18 17:43 ` [PATCH 12/16] cmake: update from 2.8.2 to 2.8.3 Otavio Salvador
` (5 subsequent siblings)
16 siblings, 0 replies; 21+ messages in thread
From: Otavio Salvador @ 2011-02-18 17:43 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
---
.../fix_fortify_source_compilation.patch | 32 --------------------
recipes/cmake/cmake-native_2.6.4.bb | 10 ------
recipes/cmake/cmake_2.6.4.bb | 11 -------
3 files changed, 0 insertions(+), 53 deletions(-)
delete mode 100644 recipes/cmake/cmake-2.6.4/fix_fortify_source_compilation.patch
delete mode 100644 recipes/cmake/cmake-native_2.6.4.bb
delete mode 100644 recipes/cmake/cmake_2.6.4.bb
diff --git a/recipes/cmake/cmake-2.6.4/fix_fortify_source_compilation.patch b/recipes/cmake/cmake-2.6.4/fix_fortify_source_compilation.patch
deleted file mode 100644
index 316ab0c..0000000
--- a/recipes/cmake/cmake-2.6.4/fix_fortify_source_compilation.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-upstream: http://public.kitware.com/mantis/view.php?id=9267
-status: pending
-origin: http://sisyphus.ru/ru/srpm/Sisyphus/cmake/patches/0
-comment: fix cmake building when FORTIFY_SOURCE is enabled
---- a/Source/kwsys/SystemInformation.cxx
-+++ b/Source/kwsys/SystemInformation.cxx
-@@ -1896,9 +1896,14 @@
- case 5: sprintf (this->ChipID.ProcessorName,"Pentium II (0.25 micron)"); break;
- case 6: sprintf (this->ChipID.ProcessorName,"Pentium II With On-Die L2 Cache"); break;
- case 7: sprintf (this->ChipID.ProcessorName,"Pentium III (0.25 micron)"); break;
-+/*
- case 8: sprintf (this->ChipID.ProcessorName,"Pentium III (0.18 micron) With 256 KB On-Die L2 Cache "); break;
- case 0xa: sprintf (this->ChipID.ProcessorName,"Pentium III (0.18 micron) With 1 Or 2 MB On-Die L2 Cache "); break;
- case 0xb: sprintf (this->ChipID.ProcessorName,"Pentium III (0.13 micron) With 256 Or 512 KB On-Die L2 Cache "); break;
-+*/
-+ case 8: sprintf (this->ChipID.ProcessorName,"Pentium III (0.18 micron) With 256 KB L2 Cache "); break;
-+ case 0xa: sprintf (this->ChipID.ProcessorName,"Pentium III (0.18 micron), 1/2 MB L2 Cache "); break;
-+ case 0xb: sprintf (this->ChipID.ProcessorName,"Pentium III (0.13 micron), 256/512 KB L2 Cache "); break;
- default: sprintf (this->ChipID.ProcessorName,"Unknown P6 family"); return false;
- }
- break;
---- a/Utilities/cmtar/encode.c
-+++ b/Utilities/cmtar/encode.c
-@@ -32,7 +32,7 @@ th_finish(TAR *t)
- int i, sum = 0;
-
- if (t->options & TAR_GNU)
-- strncpy(t->th_buf.magic, "ustar ", 8);
-+ memcpy(t->th_buf.magic, "ustar ", 8);
- else
- {
- strncpy(t->th_buf.version, TVERSION, TVERSLEN);
diff --git a/recipes/cmake/cmake-native_2.6.4.bb b/recipes/cmake/cmake-native_2.6.4.bb
deleted file mode 100644
index aab6b62..0000000
--- a/recipes/cmake/cmake-native_2.6.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-inherit native
-require cmake.inc
-
-do_install() {
- oe_runmake install
-}
-
-SRC_URI += "file://fix_fortify_source_compilation.patch"
-SRC_URI[md5sum] = "50f387d0436696c4a68b5512a72c9cde"
-SRC_URI[sha256sum] = "9cdd2152e37b05d0d40d334a1bb2dfc0250021797360f971c6ea3d457ac9fdf2"
diff --git a/recipes/cmake/cmake_2.6.4.bb b/recipes/cmake/cmake_2.6.4.bb
deleted file mode 100644
index b5a47a8..0000000
--- a/recipes/cmake/cmake_2.6.4.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require cmake.inc
-
-inherit cmake
-
-do_configure_append() {
- sed -i -e 's,HAVE_GLIBC_STRERROR_R__TRYRUN_OUTPUT-ADVANCED:INTERNAL=1,HAVE_GLIBC_STRERROR_R__TRYRUN_OUTPUT-ADVANCED:INTERNAL=0,' CMakeCache.txt
-}
-
-SRC_URI += "file://fix_fortify_source_compilation.patch"
-SRC_URI[md5sum] = "50f387d0436696c4a68b5512a72c9cde"
-SRC_URI[sha256sum] = "9cdd2152e37b05d0d40d334a1bb2dfc0250021797360f971c6ea3d457ac9fdf2"
--
1.7.2.3
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 12/16] cmake: update from 2.8.2 to 2.8.3
2011-02-18 17:43 Patchset pending for merging from O.S. Systems tree Otavio Salvador
` (10 preceding siblings ...)
2011-02-18 17:43 ` [PATCH 11/16] cmake: drop 2.6.4 as it is not used by any distro Otavio Salvador
@ 2011-02-18 17:43 ` Otavio Salvador
2011-02-18 17:43 ` [PATCH 13/16] cmake: add OE qt4-tools-{native,sdk} support Otavio Salvador
` (4 subsequent siblings)
16 siblings, 0 replies; 21+ messages in thread
From: Otavio Salvador @ 2011-02-18 17:43 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
.../cmake-2.8.2/dont-run-cross-binaries.patch | 13 ------
.../cmake-2.8.3/dont-run-cross-binaries.patch | 13 ++++++
recipes/cmake/cmake-native_2.8.2.bb | 12 -----
recipes/cmake/cmake-native_2.8.3.bb | 12 +++++
recipes/cmake/cmake-sdk_2.8.2.bb | 12 -----
recipes/cmake/cmake-sdk_2.8.3.bb | 12 +++++
recipes/cmake/cmake_2.8.2.bb | 46 --------------------
recipes/cmake/cmake_2.8.3.bb | 46 ++++++++++++++++++++
8 files changed, 83 insertions(+), 83 deletions(-)
delete mode 100644 recipes/cmake/cmake-2.8.2/dont-run-cross-binaries.patch
create mode 100644 recipes/cmake/cmake-2.8.3/dont-run-cross-binaries.patch
delete mode 100644 recipes/cmake/cmake-native_2.8.2.bb
create mode 100644 recipes/cmake/cmake-native_2.8.3.bb
delete mode 100644 recipes/cmake/cmake-sdk_2.8.2.bb
create mode 100644 recipes/cmake/cmake-sdk_2.8.3.bb
delete mode 100644 recipes/cmake/cmake_2.8.2.bb
create mode 100644 recipes/cmake/cmake_2.8.3.bb
diff --git a/recipes/cmake/cmake-2.8.2/dont-run-cross-binaries.patch b/recipes/cmake/cmake-2.8.2/dont-run-cross-binaries.patch
deleted file mode 100644
index 4a006f9..0000000
--- a/recipes/cmake/cmake-2.8.2/dont-run-cross-binaries.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru cmake-2.8.2.orig/CMakeLists.txt cmake-2.8.2/CMakeLists.txt
---- cmake-2.8.2.orig/CMakeLists.txt 2010-07-28 00:48:42.000000000 +0200
-+++ cmake-2.8.2/CMakeLists.txt 2010-07-28 01:05:17.000000000 +0200
-@@ -518,7 +518,8 @@
-
- # build the remaining subdirectories
- ADD_SUBDIRECTORY(Source)
--ADD_SUBDIRECTORY(Utilities)
-+# Come on! Running the cross-binaries on host is not a good idea.
-+#ADD_SUBDIRECTORY(Utilities)
- ADD_SUBDIRECTORY(Tests)
-
- # add a test
diff --git a/recipes/cmake/cmake-2.8.3/dont-run-cross-binaries.patch b/recipes/cmake/cmake-2.8.3/dont-run-cross-binaries.patch
new file mode 100644
index 0000000..4a006f9
--- /dev/null
+++ b/recipes/cmake/cmake-2.8.3/dont-run-cross-binaries.patch
@@ -0,0 +1,13 @@
+diff -ru cmake-2.8.2.orig/CMakeLists.txt cmake-2.8.2/CMakeLists.txt
+--- cmake-2.8.2.orig/CMakeLists.txt 2010-07-28 00:48:42.000000000 +0200
++++ cmake-2.8.2/CMakeLists.txt 2010-07-28 01:05:17.000000000 +0200
+@@ -518,7 +518,8 @@
+
+ # build the remaining subdirectories
+ ADD_SUBDIRECTORY(Source)
+-ADD_SUBDIRECTORY(Utilities)
++# Come on! Running the cross-binaries on host is not a good idea.
++#ADD_SUBDIRECTORY(Utilities)
+ ADD_SUBDIRECTORY(Tests)
+
+ # add a test
diff --git a/recipes/cmake/cmake-native_2.8.2.bb b/recipes/cmake/cmake-native_2.8.2.bb
deleted file mode 100644
index c7b3d80..0000000
--- a/recipes/cmake/cmake-native_2.8.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-inherit native
-require cmake.inc
-
-PR = "r1"
-
-SRC_URI[md5sum] = "8c967d5264657a798f22ee23976ff0d9"
-SRC_URI[sha256sum] = "766ff169af798599d7dd42e41e9f4533d73942a2bb928235115412dce5b81406"
-
-do_configure_append () {
- sed -e 's/BUILD_CursesDialog:BOOL=ON/BUILD_CursesDialog:BOOL=OFF/' \
- -i CMakeCache.txt
-}
diff --git a/recipes/cmake/cmake-native_2.8.3.bb b/recipes/cmake/cmake-native_2.8.3.bb
new file mode 100644
index 0000000..e04885f
--- /dev/null
+++ b/recipes/cmake/cmake-native_2.8.3.bb
@@ -0,0 +1,12 @@
+inherit native
+require cmake.inc
+
+PR = "r1"
+
+SRC_URI[md5sum] = "a76a44b93acf5e3badda9de111385921"
+SRC_URI[sha256sum] = "689ed02786b5cefa5515c7716784ee82a82e8ece6be5a3d629ac3cc0c05fc288"
+
+do_configure_append () {
+ sed -e 's/BUILD_CursesDialog:BOOL=ON/BUILD_CursesDialog:BOOL=OFF/' \
+ -i CMakeCache.txt
+}
diff --git a/recipes/cmake/cmake-sdk_2.8.2.bb b/recipes/cmake/cmake-sdk_2.8.2.bb
deleted file mode 100644
index 2c51a49..0000000
--- a/recipes/cmake/cmake-sdk_2.8.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-inherit sdk
-require cmake.inc
-
-PR = "r1"
-
-SRC_URI[md5sum] = "8c967d5264657a798f22ee23976ff0d9"
-SRC_URI[sha256sum] = "766ff169af798599d7dd42e41e9f4533d73942a2bb928235115412dce5b81406"
-
-do_configure_append () {
- sed -e 's/BUILD_CursesDialog:BOOL=ON/BUILD_CursesDialog:BOOL=OFF/' \
- -i CMakeCache.txt
-}
diff --git a/recipes/cmake/cmake-sdk_2.8.3.bb b/recipes/cmake/cmake-sdk_2.8.3.bb
new file mode 100644
index 0000000..5035b81
--- /dev/null
+++ b/recipes/cmake/cmake-sdk_2.8.3.bb
@@ -0,0 +1,12 @@
+inherit sdk
+require cmake.inc
+
+PR = "r1"
+
+SRC_URI[md5sum] = "a76a44b93acf5e3badda9de111385921"
+SRC_URI[sha256sum] = "689ed02786b5cefa5515c7716784ee82a82e8ece6be5a3d629ac3cc0c05fc288"
+
+do_configure_append () {
+ sed -e 's/BUILD_CursesDialog:BOOL=ON/BUILD_CursesDialog:BOOL=OFF/' \
+ -i CMakeCache.txt
+}
diff --git a/recipes/cmake/cmake_2.8.2.bb b/recipes/cmake/cmake_2.8.2.bb
deleted file mode 100644
index 41ba813..0000000
--- a/recipes/cmake/cmake_2.8.2.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-require cmake.inc
-
-inherit cmake
-
-DEPENDS += "curl expat zlib"
-
-SRC_URI += "file://dont-run-cross-binaries.patch"
-
-# Strip ${prefix} from ${docdir}, set result into docdir_stripped
-python () {
- prefix=bb.data.getVar("prefix", d, 1)
- docdir=bb.data.getVar("docdir", d, 1)
-
- if not docdir.startswith(prefix):
- raise bb.build.FuncFailed('docdir must contain prefix as its prefix')
-
- docdir_stripped = docdir[len(prefix):]
- if len(docdir_stripped) > 0 and docdir_stripped[0] == '/':
- docdir_stripped = docdir_stripped[1:]
-
- bb.data.setVar("docdir_stripped", docdir_stripped, d)
-}
-
-EXTRA_OECMAKE=" \
-# Override default "doc" (this is relative to ${prefix})
- -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-2.8 \
-# Using system libs spares us some cmake cross trouble.
- -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
-# This is compiler & target dependant, but it seems cmake does not in fact use this value.
- -DKWSYS_CHAR_IS_SIGNED=1 \
-# This disables large file support. Hopefully nobody processes >2G files on the target.
-# If you want to enable this, add -DWKSYS_LFS_WORKS=1
- -DKWSYS_LFS_DISABLE=1 \
-"
-
-SRC_URI[md5sum] = "8c967d5264657a798f22ee23976ff0d9"
-SRC_URI[sha256sum] = "766ff169af798599d7dd42e41e9f4533d73942a2bb928235115412dce5b81406"
-
-FILES_${PN} += "${datadir}/cmake-2.8"
-
-# The doc is quite... absent. Just the licensing information is there.
-# Real doc was nuked by dont-run-cross-binaries.patch. Fixing the doc
-# generation would be quite complicated, as cmake build process innovatively
-# runs the generated binaries to extract help contained in them.
-# -> Fixing this is probably not worth it.
-FILES_${PN}-doc += "${docdir}/cmake-2.8"
diff --git a/recipes/cmake/cmake_2.8.3.bb b/recipes/cmake/cmake_2.8.3.bb
new file mode 100644
index 0000000..8c96388
--- /dev/null
+++ b/recipes/cmake/cmake_2.8.3.bb
@@ -0,0 +1,46 @@
+require cmake.inc
+
+inherit cmake
+
+DEPENDS += "curl expat zlib"
+
+SRC_URI[md5sum] = "a76a44b93acf5e3badda9de111385921"
+SRC_URI[sha256sum] = "689ed02786b5cefa5515c7716784ee82a82e8ece6be5a3d629ac3cc0c05fc288"
+
+SRC_URI += "file://dont-run-cross-binaries.patch"
+
+# Strip ${prefix} from ${docdir}, set result into docdir_stripped
+python () {
+ prefix=bb.data.getVar("prefix", d, 1)
+ docdir=bb.data.getVar("docdir", d, 1)
+
+ if not docdir.startswith(prefix):
+ raise bb.build.FuncFailed('docdir must contain prefix as its prefix')
+
+ docdir_stripped = docdir[len(prefix):]
+ if len(docdir_stripped) > 0 and docdir_stripped[0] == '/':
+ docdir_stripped = docdir_stripped[1:]
+
+ bb.data.setVar("docdir_stripped", docdir_stripped, d)
+}
+
+EXTRA_OECMAKE=" \
+# Override default "doc" (this is relative to ${prefix})
+ -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-2.8 \
+# Using system libs spares us some cmake cross trouble.
+ -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
+# This is compiler & target dependant, but it seems cmake does not in fact use this value.
+ -DKWSYS_CHAR_IS_SIGNED=1 \
+# This disables large file support. Hopefully nobody processes >2G files on the target.
+# If you want to enable this, add -DWKSYS_LFS_WORKS=1
+ -DKWSYS_LFS_DISABLE=1 \
+"
+
+FILES_${PN} += "${datadir}/cmake-2.8"
+
+# The doc is quite... absent. Just the licensing information is there.
+# Real doc was nuked by dont-run-cross-binaries.patch. Fixing the doc
+# generation would be quite complicated, as cmake build process innovatively
+# runs the generated binaries to extract help contained in them.
+# -> Fixing this is probably not worth it.
+FILES_${PN}-doc += "${docdir}/cmake-2.8"
--
1.7.2.3
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 13/16] cmake: add OE qt4-tools-{native,sdk} support
2011-02-18 17:43 Patchset pending for merging from O.S. Systems tree Otavio Salvador
` (11 preceding siblings ...)
2011-02-18 17:43 ` [PATCH 12/16] cmake: update from 2.8.2 to 2.8.3 Otavio Salvador
@ 2011-02-18 17:43 ` Otavio Salvador
2011-02-18 17:43 ` [PATCH 14/16] cmake.bbclass: use 2.8 modules Otavio Salvador
` (3 subsequent siblings)
16 siblings, 0 replies; 21+ messages in thread
From: Otavio Salvador @ 2011-02-18 17:43 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
* make it find qmake2, moc4 and others
* convert to INC_PR
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
.../cmake-2.8.3/support-oe-qt4-tools-names.patch | 85 ++++++++++++++++++++
recipes/cmake/cmake-native_2.8.3.bb | 2 +-
recipes/cmake/cmake-sdk_2.8.3.bb | 2 +-
recipes/cmake/cmake.inc | 5 +-
recipes/cmake/cmake_2.8.3.bb | 2 +
5 files changed, 92 insertions(+), 4 deletions(-)
create mode 100644 recipes/cmake/cmake-2.8.3/support-oe-qt4-tools-names.patch
diff --git a/recipes/cmake/cmake-2.8.3/support-oe-qt4-tools-names.patch b/recipes/cmake/cmake-2.8.3/support-oe-qt4-tools-names.patch
new file mode 100644
index 0000000..b456923
--- /dev/null
+++ b/recipes/cmake/cmake-2.8.3/support-oe-qt4-tools-names.patch
@@ -0,0 +1,85 @@
+--- a/Modules/FindQt4.cmake
++++ b/Modules/FindQt4.cmake
+@@ -461,7 +461,7 @@
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
+-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac PATHS
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
+@@ -988,13 +988,13 @@
+ ENDIF(QT_QMAKE_CHANGED)
+
+ FIND_PROGRAM(QT_MOC_EXECUTABLE
+- NAMES moc-qt4 moc
++ NAMES moc-qt4 moc4 moc
+ PATHS ${QT_BINARY_DIR}
+ NO_DEFAULT_PATH
+ )
+
+ FIND_PROGRAM(QT_UIC_EXECUTABLE
+- NAMES uic-qt4 uic
++ NAMES uic-qt4 uic4 uic
+ PATHS ${QT_BINARY_DIR}
+ NO_DEFAULT_PATH
+ )
+@@ -1006,49 +1006,49 @@
+ )
+
+ FIND_PROGRAM(QT_RCC_EXECUTABLE
+- NAMES rcc
++ NAMES rcc4 rcc
+ PATHS ${QT_BINARY_DIR}
+ NO_DEFAULT_PATH
+ )
+
+ FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE
+- NAMES qdbuscpp2xml
++ NAMES qdbuscpp2xml4 qdbuscpp2xml
+ PATHS ${QT_BINARY_DIR}
+ NO_DEFAULT_PATH
+ )
+
+ FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE
+- NAMES qdbusxml2cpp
++ NAMES qdbusxml2cpp4 qdbusxml2cpp
+ PATHS ${QT_BINARY_DIR}
+ NO_DEFAULT_PATH
+ )
+
+ FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
+- NAMES lupdate-qt4 lupdate
++ NAMES lupdate-qt4 lupdate4 lupdate
+ PATHS ${QT_BINARY_DIR}
+ NO_DEFAULT_PATH
+ )
+
+ FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
+- NAMES lrelease-qt4 lrelease
++ NAMES lrelease-qt4 lrelease4 lrelease
+ PATHS ${QT_BINARY_DIR}
+ NO_DEFAULT_PATH
+ )
+
+ FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE
+- NAMES qcollectiongenerator-qt4 qcollectiongenerator
++ NAMES qcollectiongenerator-qt4 qcollectiongenerator4 qcollectiongenerator
+ PATHS ${QT_BINARY_DIR}
+ NO_DEFAULT_PATH
+ )
+
+ FIND_PROGRAM(QT_DESIGNER_EXECUTABLE
+- NAMES designer-qt4 designer
++ NAMES designer-qt4 designer4 designer
+ PATHS ${QT_BINARY_DIR}
+ NO_DEFAULT_PATH
+ )
+
+ FIND_PROGRAM(QT_LINGUIST_EXECUTABLE
+- NAMES linguist-qt4 linguist
++ NAMES linguist-qt4 linguist4 linguist
+ PATHS ${QT_BINARY_DIR}
+ NO_DEFAULT_PATH
+ )
diff --git a/recipes/cmake/cmake-native_2.8.3.bb b/recipes/cmake/cmake-native_2.8.3.bb
index e04885f..fa5e160 100644
--- a/recipes/cmake/cmake-native_2.8.3.bb
+++ b/recipes/cmake/cmake-native_2.8.3.bb
@@ -1,7 +1,7 @@
inherit native
require cmake.inc
-PR = "r1"
+PR = "${INC_PR}.0"
SRC_URI[md5sum] = "a76a44b93acf5e3badda9de111385921"
SRC_URI[sha256sum] = "689ed02786b5cefa5515c7716784ee82a82e8ece6be5a3d629ac3cc0c05fc288"
diff --git a/recipes/cmake/cmake-sdk_2.8.3.bb b/recipes/cmake/cmake-sdk_2.8.3.bb
index 5035b81..2dd7a17 100644
--- a/recipes/cmake/cmake-sdk_2.8.3.bb
+++ b/recipes/cmake/cmake-sdk_2.8.3.bb
@@ -1,7 +1,7 @@
inherit sdk
require cmake.inc
-PR = "r1"
+PR = "${INC_PR}.0"
SRC_URI[md5sum] = "a76a44b93acf5e3badda9de111385921"
SRC_URI[sha256sum] = "689ed02786b5cefa5515c7716784ee82a82e8ece6be5a3d629ac3cc0c05fc288"
diff --git a/recipes/cmake/cmake.inc b/recipes/cmake/cmake.inc
index ef6f5aa..814743e 100644
--- a/recipes/cmake/cmake.inc
+++ b/recipes/cmake/cmake.inc
@@ -5,10 +5,11 @@ DESCRIPTION = "A cross-platform, open-source make system"
HOMEPAGE = "http://www.cmake.org/"
LICENSE = "Berkeley-style license"
SECTION = "console/utils"
-PR = "r2"
+INC_PR = "r2"
CMAKE_MAJOR_VERSION = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
-SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz"
+SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
+ file://support-oe-qt4-tools-names.patch"
inherit autotools
diff --git a/recipes/cmake/cmake_2.8.3.bb b/recipes/cmake/cmake_2.8.3.bb
index 8c96388..cb5f7f7 100644
--- a/recipes/cmake/cmake_2.8.3.bb
+++ b/recipes/cmake/cmake_2.8.3.bb
@@ -1,5 +1,7 @@
require cmake.inc
+PR = "${INC_PR}.0"
+
inherit cmake
DEPENDS += "curl expat zlib"
--
1.7.2.3
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 14/16] cmake.bbclass: use 2.8 modules
2011-02-18 17:43 Patchset pending for merging from O.S. Systems tree Otavio Salvador
` (12 preceding siblings ...)
2011-02-18 17:43 ` [PATCH 13/16] cmake: add OE qt4-tools-{native,sdk} support Otavio Salvador
@ 2011-02-18 17:43 ` Otavio Salvador
2011-02-18 17:43 ` [PATCH 15/16] cmake.bbclass: use QT_CONF_PATH to support Qt4 projects Otavio Salvador
` (2 subsequent siblings)
16 siblings, 0 replies; 21+ messages in thread
From: Otavio Salvador @ 2011-02-18 17:43 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
classes/cmake.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass
index 29248e6..97347f2 100644
--- a/classes/cmake.bbclass
+++ b/classes/cmake.bbclass
@@ -43,7 +43,7 @@ cmake_do_generate_toolchain_file() {
echo "set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )" >> ${WORKDIR}/toolchain.cmake
echo "set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )" >> ${WORKDIR}/toolchain.cmake
# Use native cmake modules
- echo "set( CMAKE_MODULE_PATH ${STAGING_DIR_NATIVE}/usr/share/cmake-2.6/Modules/ )" >> ${WORKDIR}/toolchain.cmake
+ echo "set( CMAKE_MODULE_PATH ${STAGING_DIR_NATIVE}/usr/share/cmake-2.8/Modules/ )" >> ${WORKDIR}/toolchain.cmake
}
addtask generate_toolchain_file after do_patch before do_configure
--
1.7.2.3
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 15/16] cmake.bbclass: use QT_CONF_PATH to support Qt4 projects
2011-02-18 17:43 Patchset pending for merging from O.S. Systems tree Otavio Salvador
` (13 preceding siblings ...)
2011-02-18 17:43 ` [PATCH 14/16] cmake.bbclass: use 2.8 modules Otavio Salvador
@ 2011-02-18 17:43 ` Otavio Salvador
2011-02-18 17:43 ` [PATCH 16/16] distro/micro.conf: drop exec_prefix_native since it is unused Otavio Salvador
2011-02-19 13:04 ` Patchset pending for merging from O.S. Systems tree Frans Meulenbroeks
16 siblings, 0 replies; 21+ messages in thread
From: Otavio Salvador @ 2011-02-18 17:43 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
classes/cmake.bbclass | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass
index 97347f2..d2d1c66 100644
--- a/classes/cmake.bbclass
+++ b/classes/cmake.bbclass
@@ -44,6 +44,8 @@ cmake_do_generate_toolchain_file() {
echo "set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )" >> ${WORKDIR}/toolchain.cmake
# Use native cmake modules
echo "set( CMAKE_MODULE_PATH ${STAGING_DIR_NATIVE}/usr/share/cmake-2.8/Modules/ )" >> ${WORKDIR}/toolchain.cmake
+# Use qt.conf settings
+ echo "set( ENV{QT_CONF_PATH} ${WORKDIR}/qt.conf )" >> ${WORKDIR}/toolchain.cmake
}
addtask generate_toolchain_file after do_patch before do_configure
--
1.7.2.3
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 16/16] distro/micro.conf: drop exec_prefix_native since it is unused
2011-02-18 17:43 Patchset pending for merging from O.S. Systems tree Otavio Salvador
` (14 preceding siblings ...)
2011-02-18 17:43 ` [PATCH 15/16] cmake.bbclass: use QT_CONF_PATH to support Qt4 projects Otavio Salvador
@ 2011-02-18 17:43 ` Otavio Salvador
2011-02-19 13:04 ` Patchset pending for merging from O.S. Systems tree Frans Meulenbroeks
16 siblings, 0 replies; 21+ messages in thread
From: Otavio Salvador @ 2011-02-18 17:43 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Khem Raj <raj.khem@gmail.com>
---
conf/distro/micro.conf | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index 963afa8..b1f8f1e 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -91,7 +91,6 @@ PACKAGE_SNAP_LIB_SYMLINKS = "1"
prefix = ""
exec_prefix = ""
prefix_native = ""
-exec_prefix_native = ""
# Don't install ldconfig and associated gubbins
USE_LDCONFIG = "0"
--
1.7.2.3
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: Patchset pending for merging from O.S. Systems tree
2011-02-18 17:43 Patchset pending for merging from O.S. Systems tree Otavio Salvador
` (15 preceding siblings ...)
2011-02-18 17:43 ` [PATCH 16/16] distro/micro.conf: drop exec_prefix_native since it is unused Otavio Salvador
@ 2011-02-19 13:04 ` Frans Meulenbroeks
2011-02-19 13:11 ` Otavio Salvador
16 siblings, 1 reply; 21+ messages in thread
From: Frans Meulenbroeks @ 2011-02-19 13:04 UTC (permalink / raw)
To: openembedded-devel
2011/2/18 Otavio Salvador <otavio@ossystems.com.br>:
>
> Hello,
>
> Those patches are the ones I sent some days ago, with the requested
> fixes and also with the acked-bys already given plus some new ones
> that have been cooked here afterwards.
>
> I've done a full build from scratch using those and it seems safe to
> get those in. Please ack/nack and push according.
>
> TIA,
>
> _______________________________________________
>
Applied the first 10 and the last patch.
Thanks for contributing.
I did not push the cmake patches as they have no acks yet and I feel
not comfortable with cmake.
Enjoy, Frans.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Patchset pending for merging from O.S. Systems tree
2011-02-19 13:04 ` Patchset pending for merging from O.S. Systems tree Frans Meulenbroeks
@ 2011-02-19 13:11 ` Otavio Salvador
0 siblings, 0 replies; 21+ messages in thread
From: Otavio Salvador @ 2011-02-19 13:11 UTC (permalink / raw)
To: openembedded-devel
On Sat, Feb 19, 2011 at 13:04, Frans Meulenbroeks
<fransmeulenbroeks@gmail.com> wrote:
> Applied the first 10 and the last patch.
> Thanks for contributing.
Thanks by pushing them.
> I did not push the cmake patches as they have no acks yet and I feel
> not comfortable with cmake.
Right.
I already have few more patches queued up and will send them once
again for review on monday probably.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 07/16] libinih: add
2011-02-18 17:43 ` [PATCH 07/16] libinih: add Otavio Salvador
@ 2011-02-20 9:37 ` Frans Meulenbroeks
2011-02-22 16:57 ` Otavio Salvador
0 siblings, 1 reply; 21+ messages in thread
From: Frans Meulenbroeks @ 2011-02-20 9:37 UTC (permalink / raw)
To: openembedded-devel
2011/2/18 Otavio Salvador <otavio@ossystems.com.br>:
> This provides a C and C++ INI library that can be statically linked
> into projects.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> Acked-by: Khem Raj <raj.khem@gmail.com>
I pushed this recipe yesterday, but apparently it seems to break the
build, so I reverted it.
Guess this is the bad guy:
SRCREV = "${AUTOREV}"
anyway using autorev is not really desired (didn't realize it when pushing)
Otavio can you come with a better version?
Frans
> ---
> recipes/libinih/libinih_git.bb | 14 ++++++++++++++
> 1 files changed, 14 insertions(+), 0 deletions(-)
> create mode 100644 recipes/libinih/libinih_git.bb
>
> diff --git a/recipes/libinih/libinih_git.bb b/recipes/libinih/libinih_git.bb
> new file mode 100644
> index 0000000..e9f811f
> --- /dev/null
> +++ b/recipes/libinih/libinih_git.bb
> @@ -0,0 +1,14 @@
> +DESCRIPTION = "C and C++ INI Library"
> +PRIORITY = "optional"
> +PV = "0.0+gitr${SRCPV}"
> +PKGV = "${GITPKGVTAG}"
> +PR = "r0"
> +LICENSE = "BSD"
> +RDEPENDS_${PN}-dev = ""
> +
> +SRCREV = "${AUTOREV}"
> +SRC_URI = "git://projetos.ossystems.com.br/git/libinih.git;protocol=git"
> +
> +S = "${WORKDIR}/git"
> +
> +inherit gitpkgv cmake
> --
> 1.7.2.3
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 07/16] libinih: add
2011-02-20 9:37 ` Frans Meulenbroeks
@ 2011-02-22 16:57 ` Otavio Salvador
0 siblings, 0 replies; 21+ messages in thread
From: Otavio Salvador @ 2011-02-22 16:57 UTC (permalink / raw)
To: openembedded-devel
On Sun, Feb 20, 2011 at 09:37, Frans Meulenbroeks
<fransmeulenbroeks@gmail.com> wrote:
...
> I pushed this recipe yesterday, but apparently it seems to break the
> build, so I reverted it.
> Guess this is the bad guy:
> SRCREV = "${AUTOREV}"
> anyway using autorev is not really desired (didn't realize it when pushing)
>
> Otavio can you come with a better version?
...
Yes; I will address it.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2011-02-22 16:58 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-02-18 17:43 Patchset pending for merging from O.S. Systems tree Otavio Salvador
2011-02-18 17:43 ` [PATCH 01/16] xkeyboard-config: avoid recipe code duplication and depends on intltool-native Otavio Salvador
2011-02-18 17:43 ` [PATCH 02/16] python-dbus: update to 0.83.2 and fix rpath to use absolute path Otavio Salvador
2011-02-18 17:43 ` [PATCH 03/16] cups: drop unused versions Otavio Salvador
2011-02-18 17:43 ` [PATCH 04/16] cups: merge cups.inc into cups 1.2.12 recipe Otavio Salvador
2011-02-18 17:43 ` [PATCH 05/16] cups: merge cups14.inc into cups 1.4.4 recipe Otavio Salvador
2011-02-18 17:43 ` [PATCH 06/16] cups: add textonly filter and split packages Otavio Salvador
2011-02-18 17:43 ` [PATCH 07/16] libinih: add Otavio Salvador
2011-02-20 9:37 ` Frans Meulenbroeks
2011-02-22 16:57 ` Otavio Salvador
2011-02-18 17:43 ` [PATCH 08/16] sdk.bbclass: cache ${libdir} as ${target_libdir} Otavio Salvador
2011-02-18 17:43 ` [PATCH 09/16] qt4-tools-sdk: use host include headers for dbus Otavio Salvador
2011-02-18 17:43 ` [PATCH 10/16] qmake_base.bbclass: add generate_qt_config_file task Otavio Salvador
2011-02-18 17:43 ` [PATCH 11/16] cmake: drop 2.6.4 as it is not used by any distro Otavio Salvador
2011-02-18 17:43 ` [PATCH 12/16] cmake: update from 2.8.2 to 2.8.3 Otavio Salvador
2011-02-18 17:43 ` [PATCH 13/16] cmake: add OE qt4-tools-{native,sdk} support Otavio Salvador
2011-02-18 17:43 ` [PATCH 14/16] cmake.bbclass: use 2.8 modules Otavio Salvador
2011-02-18 17:43 ` [PATCH 15/16] cmake.bbclass: use QT_CONF_PATH to support Qt4 projects Otavio Salvador
2011-02-18 17:43 ` [PATCH 16/16] distro/micro.conf: drop exec_prefix_native since it is unused Otavio Salvador
2011-02-19 13:04 ` Patchset pending for merging from O.S. Systems tree Frans Meulenbroeks
2011-02-19 13:11 ` Otavio Salvador
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.