* [PATCH 00/14] Patchset waiting for merging on O.S. Systems tree @ 2011-02-23 13:07 Otavio Salvador 2011-02-23 13:07 ` [PATCH 01/14] qmake_base.bbclass: add generate_qt_config_file task Otavio Salvador 0 siblings, 1 reply; 23+ messages in thread From: Otavio Salvador @ 2011-02-23 13:07 UTC (permalink / raw) To: openembedded-devel Hello, I am sending the list of 14 patches waiting for merging into master. They all seem to be working fine and specially the qmake/cmake ones are important to users of Qt since it makes it work for CMake based projects and SDK toolchains. Thanks in advance, ^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH 01/14] qmake_base.bbclass: add generate_qt_config_file task 2011-02-23 13:07 [PATCH 00/14] Patchset waiting for merging on O.S. Systems tree Otavio Salvador @ 2011-02-23 13:07 ` Otavio Salvador 2011-02-23 13:07 ` [PATCH 02/14] cmake: drop 2.6.4 as it is not used by any distro Otavio Salvador 0 siblings, 1 reply; 23+ messages in thread From: Otavio Salvador @ 2011-02-23 13:07 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] 23+ messages in thread
* [PATCH 02/14] cmake: drop 2.6.4 as it is not used by any distro 2011-02-23 13:07 ` [PATCH 01/14] qmake_base.bbclass: add generate_qt_config_file task Otavio Salvador @ 2011-02-23 13:07 ` Otavio Salvador 2011-02-23 13:07 ` [PATCH 03/14] cmake: update from 2.8.2 to 2.8.3 Otavio Salvador 0 siblings, 1 reply; 23+ messages in thread From: Otavio Salvador @ 2011-02-23 13:07 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] 23+ messages in thread
* [PATCH 03/14] cmake: update from 2.8.2 to 2.8.3 2011-02-23 13:07 ` [PATCH 02/14] cmake: drop 2.6.4 as it is not used by any distro Otavio Salvador @ 2011-02-23 13:07 ` Otavio Salvador 2011-02-23 13:07 ` [PATCH 04/14] cmake: add OE qt4-tools-{native,sdk} support Otavio Salvador 0 siblings, 1 reply; 23+ messages in thread From: Otavio Salvador @ 2011-02-23 13:07 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] 23+ messages in thread
* [PATCH 04/14] cmake: add OE qt4-tools-{native,sdk} support 2011-02-23 13:07 ` [PATCH 03/14] cmake: update from 2.8.2 to 2.8.3 Otavio Salvador @ 2011-02-23 13:07 ` Otavio Salvador 2011-02-23 13:07 ` [PATCH 05/14] cmake.bbclass: use 2.8 modules Otavio Salvador 0 siblings, 1 reply; 23+ messages in thread From: Otavio Salvador @ 2011-02-23 13:07 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] 23+ messages in thread
* [PATCH 05/14] cmake.bbclass: use 2.8 modules 2011-02-23 13:07 ` [PATCH 04/14] cmake: add OE qt4-tools-{native,sdk} support Otavio Salvador @ 2011-02-23 13:07 ` Otavio Salvador 2011-02-23 13:07 ` [PATCH 06/14] cmake.bbclass: use QT_CONF_PATH to support Qt4 projects Otavio Salvador 2011-02-23 13:41 ` [PATCH 05/14] cmake.bbclass: use 2.8 modules Phil Blundell 0 siblings, 2 replies; 23+ messages in thread From: Otavio Salvador @ 2011-02-23 13:07 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] 23+ messages in thread
* [PATCH 06/14] cmake.bbclass: use QT_CONF_PATH to support Qt4 projects 2011-02-23 13:07 ` [PATCH 05/14] cmake.bbclass: use 2.8 modules Otavio Salvador @ 2011-02-23 13:07 ` Otavio Salvador 2011-02-23 13:07 ` [PATCH 07/14] ntfsprogs: add 2.0.0 Otavio Salvador 2011-02-23 13:41 ` [PATCH 05/14] cmake.bbclass: use 2.8 modules Phil Blundell 1 sibling, 1 reply; 23+ messages in thread From: Otavio Salvador @ 2011-02-23 13:07 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] 23+ messages in thread
* [PATCH 07/14] ntfsprogs: add 2.0.0 2011-02-23 13:07 ` [PATCH 06/14] cmake.bbclass: use QT_CONF_PATH to support Qt4 projects Otavio Salvador @ 2011-02-23 13:07 ` Otavio Salvador 2011-02-23 13:07 ` [PATCH 08/14] syslinux: add isolinux and chain packages Otavio Salvador 0 siblings, 1 reply; 23+ messages in thread From: Otavio Salvador @ 2011-02-23 13:07 UTC (permalink / raw) To: openembedded-devel; +Cc: Otavio Salvador This recipe has been imported from O.S. Systems tree and hence starts at revision r2. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- .../ntfsprogs/ntfsprogs/skip-erange-errors.patch | 30 ++++++++++++++++++++ recipes/ntfsprogs/ntfsprogs_2.0.0.bb | 15 ++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) create mode 100644 recipes/ntfsprogs/ntfsprogs/skip-erange-errors.patch create mode 100644 recipes/ntfsprogs/ntfsprogs_2.0.0.bb diff --git a/recipes/ntfsprogs/ntfsprogs/skip-erange-errors.patch b/recipes/ntfsprogs/ntfsprogs/skip-erange-errors.patch new file mode 100644 index 0000000..7292d77 --- /dev/null +++ b/recipes/ntfsprogs/ntfsprogs/skip-erange-errors.patch @@ -0,0 +1,30 @@ +diff --git a/libntfs/attrib.c b/libntfs/attrib.c +index a1fe954..c628d9d 100644 +--- a/libntfs/attrib.c ++++ b/libntfs/attrib.c +@@ -550,8 +550,10 @@ int ntfs_attr_map_runlist_range(ntfs_attr *na, VCN from_vcn, VCN to_vcn) + (long long)from_vcn, (long long)to_vcn); + + /* Map extent with @from_vcn. */ +- if (ntfs_attr_map_runlist(na, from_vcn)) +- goto err_out; ++ if (ntfs_attr_map_runlist(na, from_vcn)) { ++ if (errno != ERANGE) ++ goto err_out; ++ } + + for (rl = na->rl; rl->vcn <= to_vcn;) { + /* Skip not interesting to us runs. */ +@@ -4924,8 +4926,10 @@ static int ntfs_non_resident_attr_expand(ntfs_attr *na, const s64 newsize, + /* Map required part of runlist. */ + if (ntfs_attr_map_runlist(na, na->allocated_size >> + vol->cluster_size_bits)) { +- ntfs_log_error("Failed to map runlist.\n"); +- return -1; ++ if (errno != ERANGE) { ++ ntfs_log_error("Failed to map runlist.\n"); ++ return -1; ++ } + } + + /* diff --git a/recipes/ntfsprogs/ntfsprogs_2.0.0.bb b/recipes/ntfsprogs/ntfsprogs_2.0.0.bb new file mode 100644 index 0000000..b41985d --- /dev/null +++ b/recipes/ntfsprogs/ntfsprogs_2.0.0.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "NTFS utilies" +HOMEPAGE = "http://www.linux-ntfs.org/" +DEPENDS = "fuse" +LICENSE = "GPLv2" +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/linux-ntfs/ntfsprogs-2.0.0.tar.bz2 \ + file://skip-erange-errors.patch" + +SRC_URI[md5sum] = "2b39dece8897bc748f4ab4c40ec7699e" +SRC_URI[sha256sum] = "ad36e19706c7303b10aa0a9bf2c2dd0309b91cd0171f1c9eb361d94a85017432" + +inherit autotools + +EXTRA_OECONF += "--disable-gnome-vfs" -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 08/14] syslinux: add isolinux and chain packages 2011-02-23 13:07 ` [PATCH 07/14] ntfsprogs: add 2.0.0 Otavio Salvador @ 2011-02-23 13:07 ` Otavio Salvador 2011-02-23 13:07 ` [PATCH 09/14] contrib/openembedded-essential (debian): rename to be version agnostic Otavio Salvador 0 siblings, 1 reply; 23+ messages in thread From: Otavio Salvador @ 2011-02-23 13:07 UTC (permalink / raw) To: openembedded-devel; +Cc: Otavio Salvador This syncs the package recipe with the O.S. Systems tree adding more packages and fixing GNU_HASH issues. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- recipes/syslinux/syslinux_3.82.bb | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/recipes/syslinux/syslinux_3.82.bb b/recipes/syslinux/syslinux_3.82.bb index f899d9f..fcb066d 100644 --- a/recipes/syslinux/syslinux_3.82.bb +++ b/recipes/syslinux/syslinux_3.82.bb @@ -1,5 +1,5 @@ # syslinux OE build file -# Copyright (C) 2009, O.S. Systems Software Ltda. All Rights Reserved +# Copyright (C) 2009, 2011, O.S. Systems Software Ltda. All Rights Reserved # Released under the MIT license (see packages/COPYING) DESCRIPTION = "A multi-purpose linux bootloader" @@ -7,7 +7,7 @@ HOMEPAGE = "http://syslinux.zytor.com/" LICENSE = "GPL" DEPENDS = "nasm-native" RRECOMMENDS_${PN} = "mtools" -PR = "r0" +PR = "r3" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 " @@ -27,17 +27,20 @@ do_configure() { do_compile() { # Rebuild only the installer; keep precompiled bootloaders # as per author's request (doc/distrib.txt) - oe_runmake CC="${CC}" installer + oe_runmake CC="${CC}" LDFLAGS="${LDFLAGS}" installer } do_install() { oe_runmake install INSTALLROOT="${D}" } -PACKAGES =+ "${PN}-extlinux ${PN}-mbr" +PACKAGES =+ "${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux" FILES_${PN} = "${bindir}/syslinux" FILES_${PN}-extlinux = "${base_sbindir}/extlinux" FILES_${PN}-mbr = "${datadir}/${PN}/mbr.bin" +FILES_${PN}-chain = "${datadir}/${PN}/chain.c32" +FILES_${PN}-isolinux = "${datadir}/${PN}/isolinux.bin" +FILES_${PN}-pxelinux = "${datadir}/${PN}/pxelinux.0" FILES_${PN}-dev += "${datadir}/${PN}/com32" SRC_URI[md5sum] = "c9f4e73e385c86b3a8faf9b615a04836" -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 09/14] contrib/openembedded-essential (debian): rename to be version agnostic 2011-02-23 13:07 ` [PATCH 08/14] syslinux: add isolinux and chain packages Otavio Salvador @ 2011-02-23 13:07 ` Otavio Salvador 2011-02-23 13:07 ` [PATCH 10/14] contrib/openembedded-essential (debian): depends on chrpath Otavio Salvador 0 siblings, 1 reply; 23+ messages in thread From: Otavio Salvador @ 2011-02-23 13:07 UTC (permalink / raw) To: openembedded-devel; +Cc: Otavio Salvador Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- .../openembedded-essential-1.4/debian/changelog | 34 -------------------- .../openembedded-essential-1.4/debian/compat | 1 - .../openembedded-essential-1.4/debian/control | 17 ---------- .../openembedded-essential-1.4/debian/copyright | 12 ------- .../debian/openembedded-essential-1.4/debian/rules | 21 ------------ .../debian/openembedded-essential-1.4/ubuntu.patch | 22 ------------- .../debian/openembedded-essential/debian/changelog | 34 ++++++++++++++++++++ .../debian/openembedded-essential/debian/compat | 1 + .../debian/openembedded-essential/debian/control | 17 ++++++++++ .../debian/openembedded-essential/debian/copyright | 12 +++++++ .../debian/openembedded-essential/debian/rules | 21 ++++++++++++ .../debian/openembedded-essential/ubuntu.patch | 22 +++++++++++++ 12 files changed, 107 insertions(+), 107 deletions(-) delete mode 100644 contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog delete mode 100644 contrib/distro-packages/debian/openembedded-essential-1.4/debian/compat delete mode 100644 contrib/distro-packages/debian/openembedded-essential-1.4/debian/control delete mode 100644 contrib/distro-packages/debian/openembedded-essential-1.4/debian/copyright delete mode 100755 contrib/distro-packages/debian/openembedded-essential-1.4/debian/rules delete mode 100644 contrib/distro-packages/debian/openembedded-essential-1.4/ubuntu.patch create mode 100644 contrib/distro-packages/debian/openembedded-essential/debian/changelog create mode 100644 contrib/distro-packages/debian/openembedded-essential/debian/compat create mode 100644 contrib/distro-packages/debian/openembedded-essential/debian/control create mode 100644 contrib/distro-packages/debian/openembedded-essential/debian/copyright create mode 100755 contrib/distro-packages/debian/openembedded-essential/debian/rules create mode 100644 contrib/distro-packages/debian/openembedded-essential/ubuntu.patch diff --git a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog b/contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog deleted file mode 100644 index 8485f3e..0000000 --- a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog +++ /dev/null @@ -1,34 +0,0 @@ -openembedded-essential (1.4) unstable; urgency=low - - * remove gfortran from dependency after a5c7b007eaa675cc904f5285291d2f8a597efc84 caused controversy. - Ultimately it was decided that OE should not depend on gfortran and that another solution ought - to be found. The gfortran check in sanity.bbclass was dropped in 63c7ad87655c2781ad8b9c81af430596f48a24a6 - * add bc and python-pysqlite2 for rpm - - -- Rolf Leggewie <oe-devel@rolf.leggewie.biz> Mon, 19 Jan 2008 14:25:00 +0100 - -openembedded-essential (1.3) unstable; urgency=low - - * add gfortran as dependency to complement a5c7b007eaa675cc904f5285291d2f8a597efc84 - - -- Rolf Leggewie <oe-devel@rolf.leggewie.biz> Mon, 7 Jan 2008 20:25:00 +0100 - -openembedded-essential (1.2) unstable; urgency=low - - * fixed packaging to make lintian happy - * switched to native numbering - - -- Marcin Juszkiewicz <hrw@openembedded.org> Wed, 8 Nov 2006 11:17:42 +0100 - -openembedded-essential (1.1) unstable; urgency=low - - * added gawk - - -- Marcin Juszkiewicz <hrw@openembedded.org> Wed, 8 Nov 2006 11:17:42 +0100 - -openembedded-essential (1.0-1) unstable; urgency=low - - * Initial release - - -- Marcin Juszkiewicz <hrw@openembedded.org> Tue, 17 Oct 2006 12:05:35 +0200 - diff --git a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/compat b/contrib/distro-packages/debian/openembedded-essential-1.4/debian/compat deleted file mode 100644 index 7ed6ff8..0000000 --- a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/control b/contrib/distro-packages/debian/openembedded-essential-1.4/debian/control deleted file mode 100644 index 9f1e095..0000000 --- a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/control +++ /dev/null @@ -1,17 +0,0 @@ -Source: openembedded-essential -Section: devel -Priority: optional -Maintainer: Marcin Juszkiewicz <hrw@openembedded.org> -Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.3 - -Package: openembedded-essential -Architecture: all -Depends: python (>= 2.3), ccache, build-essential, quilt, bison, wget, cvs, subversion, git-core, monotone, coreutils, unzip, texi2html, texinfo, libsdl1.2-dev, docbook-utils, gawk, bc, python-pysqlite2, help2man -Description: Metapackage to install all needed packages to start using OpenEmbedded - OpenEmbedded is a full-featured development environment allowing users to - target a wide variety of devices. Supporting multiple build, release paths and - configurations, OpenEmbedded extends the capabilities of your build and - release engineers. OpenEmbedded uses compilation and configuration caching at - most levels to increase developer productivity. - This metapackage depends on all software required by OpenEmbedded. diff --git a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/copyright b/contrib/distro-packages/debian/openembedded-essential-1.4/debian/copyright deleted file mode 100644 index 9e4905f..0000000 --- a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/copyright +++ /dev/null @@ -1,12 +0,0 @@ -This package was debianized by Marcin Juszkiewicz <hrw@hrw.one.pl> on -Tue, 17 Oct 2006 12:05:35 +0200. - -Upstream Author: Marcin Juszkiewicz <hrw@hrw.one.pl> - -Copyright: -2006 Marcin Juszkiewicz <hrw@hrw.one.pl> - -License: GPLv2 - -The Debian packaging is (C) 2006, Marcin Juszkiewicz <hrw@hrw.one.pl> and -is licensed under the GPLv2, see `/usr/share/common-licenses/GPL-2'. diff --git a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/rules b/contrib/distro-packages/debian/openembedded-essential-1.4/debian/rules deleted file mode 100755 index 22ac384..0000000 --- a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/rules +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/make -f - -build: -binary-arch: - -clean: - dh_clean - -binary-indep: - dh_testdir - dh_testroot - dh_installchangelogs - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep -.PHONY: build clean binary-indep binary binary-arch diff --git a/contrib/distro-packages/debian/openembedded-essential-1.4/ubuntu.patch b/contrib/distro-packages/debian/openembedded-essential-1.4/ubuntu.patch deleted file mode 100644 index 80863d5..0000000 --- a/contrib/distro-packages/debian/openembedded-essential-1.4/ubuntu.patch +++ /dev/null @@ -1,22 +0,0 @@ -# -# old_revision [63896b37ec0e055133c2e295f7c89e4677091511] -# -# patch "contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog" -# from [b1e7c5d0ed3dddbab736f23b57df2386b6937e4d] -# to [bb02f8caa6f5eaa903b4d65150392583072c7bea] -# -============================================================ ---- contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog -b1e7c5d0ed3dddbab736f23b57df2386b6937e4d -+++ contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog -bb02f8caa6f5eaa903b4d65150392583072c7bea -@@ -1,3 +1,9 @@ -+openembedded-essential (1.4ubuntu1) gutsy; urgency=low -+ -+ * prepare ubuntu package -+ -+ -- Rolf Leggewie <oe-devel@rolf.leggewie.biz> Thu, 24 Jan 2008 13:49:26 +0100 -+ - openembedded-essential (1.4) unstable; urgency=low - - * remove gfortran from dependency after a5c7b007eaa675cc904f5285291d2f8a597efc84 caused controversy. diff --git a/contrib/distro-packages/debian/openembedded-essential/debian/changelog b/contrib/distro-packages/debian/openembedded-essential/debian/changelog new file mode 100644 index 0000000..8485f3e --- /dev/null +++ b/contrib/distro-packages/debian/openembedded-essential/debian/changelog @@ -0,0 +1,34 @@ +openembedded-essential (1.4) unstable; urgency=low + + * remove gfortran from dependency after a5c7b007eaa675cc904f5285291d2f8a597efc84 caused controversy. + Ultimately it was decided that OE should not depend on gfortran and that another solution ought + to be found. The gfortran check in sanity.bbclass was dropped in 63c7ad87655c2781ad8b9c81af430596f48a24a6 + * add bc and python-pysqlite2 for rpm + + -- Rolf Leggewie <oe-devel@rolf.leggewie.biz> Mon, 19 Jan 2008 14:25:00 +0100 + +openembedded-essential (1.3) unstable; urgency=low + + * add gfortran as dependency to complement a5c7b007eaa675cc904f5285291d2f8a597efc84 + + -- Rolf Leggewie <oe-devel@rolf.leggewie.biz> Mon, 7 Jan 2008 20:25:00 +0100 + +openembedded-essential (1.2) unstable; urgency=low + + * fixed packaging to make lintian happy + * switched to native numbering + + -- Marcin Juszkiewicz <hrw@openembedded.org> Wed, 8 Nov 2006 11:17:42 +0100 + +openembedded-essential (1.1) unstable; urgency=low + + * added gawk + + -- Marcin Juszkiewicz <hrw@openembedded.org> Wed, 8 Nov 2006 11:17:42 +0100 + +openembedded-essential (1.0-1) unstable; urgency=low + + * Initial release + + -- Marcin Juszkiewicz <hrw@openembedded.org> Tue, 17 Oct 2006 12:05:35 +0200 + diff --git a/contrib/distro-packages/debian/openembedded-essential/debian/compat b/contrib/distro-packages/debian/openembedded-essential/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/contrib/distro-packages/debian/openembedded-essential/debian/compat @@ -0,0 +1 @@ +5 diff --git a/contrib/distro-packages/debian/openembedded-essential/debian/control b/contrib/distro-packages/debian/openembedded-essential/debian/control new file mode 100644 index 0000000..9f1e095 --- /dev/null +++ b/contrib/distro-packages/debian/openembedded-essential/debian/control @@ -0,0 +1,17 @@ +Source: openembedded-essential +Section: devel +Priority: optional +Maintainer: Marcin Juszkiewicz <hrw@openembedded.org> +Build-Depends: debhelper (>= 5) +Standards-Version: 3.7.3 + +Package: openembedded-essential +Architecture: all +Depends: python (>= 2.3), ccache, build-essential, quilt, bison, wget, cvs, subversion, git-core, monotone, coreutils, unzip, texi2html, texinfo, libsdl1.2-dev, docbook-utils, gawk, bc, python-pysqlite2, help2man +Description: Metapackage to install all needed packages to start using OpenEmbedded + OpenEmbedded is a full-featured development environment allowing users to + target a wide variety of devices. Supporting multiple build, release paths and + configurations, OpenEmbedded extends the capabilities of your build and + release engineers. OpenEmbedded uses compilation and configuration caching at + most levels to increase developer productivity. + This metapackage depends on all software required by OpenEmbedded. diff --git a/contrib/distro-packages/debian/openembedded-essential/debian/copyright b/contrib/distro-packages/debian/openembedded-essential/debian/copyright new file mode 100644 index 0000000..9e4905f --- /dev/null +++ b/contrib/distro-packages/debian/openembedded-essential/debian/copyright @@ -0,0 +1,12 @@ +This package was debianized by Marcin Juszkiewicz <hrw@hrw.one.pl> on +Tue, 17 Oct 2006 12:05:35 +0200. + +Upstream Author: Marcin Juszkiewicz <hrw@hrw.one.pl> + +Copyright: +2006 Marcin Juszkiewicz <hrw@hrw.one.pl> + +License: GPLv2 + +The Debian packaging is (C) 2006, Marcin Juszkiewicz <hrw@hrw.one.pl> and +is licensed under the GPLv2, see `/usr/share/common-licenses/GPL-2'. diff --git a/contrib/distro-packages/debian/openembedded-essential/debian/rules b/contrib/distro-packages/debian/openembedded-essential/debian/rules new file mode 100755 index 0000000..22ac384 --- /dev/null +++ b/contrib/distro-packages/debian/openembedded-essential/debian/rules @@ -0,0 +1,21 @@ +#!/usr/bin/make -f + +build: +binary-arch: + +clean: + dh_clean + +binary-indep: + dh_testdir + dh_testroot + dh_installchangelogs + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep +.PHONY: build clean binary-indep binary binary-arch diff --git a/contrib/distro-packages/debian/openembedded-essential/ubuntu.patch b/contrib/distro-packages/debian/openembedded-essential/ubuntu.patch new file mode 100644 index 0000000..80863d5 --- /dev/null +++ b/contrib/distro-packages/debian/openembedded-essential/ubuntu.patch @@ -0,0 +1,22 @@ +# +# old_revision [63896b37ec0e055133c2e295f7c89e4677091511] +# +# patch "contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog" +# from [b1e7c5d0ed3dddbab736f23b57df2386b6937e4d] +# to [bb02f8caa6f5eaa903b4d65150392583072c7bea] +# +============================================================ +--- contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog +b1e7c5d0ed3dddbab736f23b57df2386b6937e4d ++++ contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog +bb02f8caa6f5eaa903b4d65150392583072c7bea +@@ -1,3 +1,9 @@ ++openembedded-essential (1.4ubuntu1) gutsy; urgency=low ++ ++ * prepare ubuntu package ++ ++ -- Rolf Leggewie <oe-devel@rolf.leggewie.biz> Thu, 24 Jan 2008 13:49:26 +0100 ++ + openembedded-essential (1.4) unstable; urgency=low + + * remove gfortran from dependency after a5c7b007eaa675cc904f5285291d2f8a597efc84 caused controversy. -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 10/14] contrib/openembedded-essential (debian): depends on chrpath 2011-02-23 13:07 ` [PATCH 09/14] contrib/openembedded-essential (debian): rename to be version agnostic Otavio Salvador @ 2011-02-23 13:07 ` Otavio Salvador 2011-02-23 13:07 ` [PATCH 11/14] parted: fix MiB handling Otavio Salvador 0 siblings, 1 reply; 23+ messages in thread From: Otavio Salvador @ 2011-02-23 13:07 UTC (permalink / raw) To: openembedded-devel; +Cc: Otavio Salvador Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- .../debian/openembedded-essential/debian/changelog | 6 ++++++ .../debian/openembedded-essential/debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/contrib/distro-packages/debian/openembedded-essential/debian/changelog b/contrib/distro-packages/debian/openembedded-essential/debian/changelog index 8485f3e..afd198a 100644 --- a/contrib/distro-packages/debian/openembedded-essential/debian/changelog +++ b/contrib/distro-packages/debian/openembedded-essential/debian/changelog @@ -1,3 +1,9 @@ +openembedded-essential (1.5) unstable; urgency=low + + * add chrpath as dependency. + + -- Otavio Salvador <otavio@ossystems.com.br> Fri, 18 Feb 2011 02:00:59 +0000 + openembedded-essential (1.4) unstable; urgency=low * remove gfortran from dependency after a5c7b007eaa675cc904f5285291d2f8a597efc84 caused controversy. diff --git a/contrib/distro-packages/debian/openembedded-essential/debian/control b/contrib/distro-packages/debian/openembedded-essential/debian/control index 9f1e095..f751672 100644 --- a/contrib/distro-packages/debian/openembedded-essential/debian/control +++ b/contrib/distro-packages/debian/openembedded-essential/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.7.3 Package: openembedded-essential Architecture: all -Depends: python (>= 2.3), ccache, build-essential, quilt, bison, wget, cvs, subversion, git-core, monotone, coreutils, unzip, texi2html, texinfo, libsdl1.2-dev, docbook-utils, gawk, bc, python-pysqlite2, help2man +Depends: python (>= 2.3), ccache, build-essential, quilt, bison, wget, cvs, subversion, git-core, monotone, coreutils, unzip, texi2html, texinfo, libsdl1.2-dev, docbook-utils, gawk, bc, python-pysqlite2, help2man, chrpath Description: Metapackage to install all needed packages to start using OpenEmbedded OpenEmbedded is a full-featured development environment allowing users to target a wide variety of devices. Supporting multiple build, release paths and -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 11/14] parted: fix MiB handling 2011-02-23 13:07 ` [PATCH 10/14] contrib/openembedded-essential (debian): depends on chrpath Otavio Salvador @ 2011-02-23 13:07 ` Otavio Salvador 2011-02-23 13:07 ` [PATCH 12/14] libinih: readd without AUTOREV Otavio Salvador 0 siblings, 1 reply; 23+ messages in thread From: Otavio Salvador @ 2011-02-23 13:07 UTC (permalink / raw) To: openembedded-devel; +Cc: Otavio Salvador Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- recipes/parted/files/fix-MiB-handling.patch | 130 +++++++++++++++++++++++++++ recipes/parted/parted_2.3.bb | 2 + 2 files changed, 132 insertions(+), 0 deletions(-) create mode 100644 recipes/parted/files/fix-MiB-handling.patch diff --git a/recipes/parted/files/fix-MiB-handling.patch b/recipes/parted/files/fix-MiB-handling.patch new file mode 100644 index 0000000..db4945f --- /dev/null +++ b/recipes/parted/files/fix-MiB-handling.patch @@ -0,0 +1,130 @@ +Delivered-To: otavio.salvador@gmail.com +Received: by 10.204.59.147 with SMTP id l19cs132424bkh; + Sun, 16 Jan 2011 04:26:09 -0800 (PST) +Received: by 10.90.113.8 with SMTP id l8mr1322981agc.21.1295180768845; + Sun, 16 Jan 2011 04:26:08 -0800 (PST) +Return-Path: <bug-parted-bounces+otavio=debian.org@gnu.org> +Received: from master.debian.org (master.debian.org [70.103.162.29]) + by mx.google.com with ESMTPS id c36si6867598ana.168.2011.01.16.04.26.08 + (version=TLSv1/SSLv3 cipher=RC4-MD5); + Sun, 16 Jan 2011 04:26:08 -0800 (PST) +Received-SPF: softfail (google.com: domain of transitioning bug-parted-bounces+otavio=debian.org@gnu.org does not designate 70.103.162.29 as permitted sender) client-ip=70.103.162.29; +Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning bug-parted-bounces+otavio=debian.org@gnu.org does not designate 70.103.162.29 as permitted sender) smtp.mail=bug-parted-bounces+otavio=debian.org@gnu.org +Received: from lists.gnu.org ([199.232.76.165]) + by master.debian.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) + (Exim 4.69) + (envelope-from <bug-parted-bounces+otavio=debian.org@gnu.org>) + id 1PeRgN-00069u-NM + for otavio.salvador@gmail.com; Sun, 16 Jan 2011 12:26:08 +0000 +Received: from localhost ([127.0.0.1]:34642 helo=lists.gnu.org) + by lists.gnu.org with esmtp (Exim 4.43) + id 1PeRgL-0007eS-Ku + for otavio@debian.org; Sun, 16 Jan 2011 07:26:05 -0500 +Received: from [140.186.70.92] (port=41438 helo=eggs.gnu.org) + by lists.gnu.org with esmtp (Exim 4.43) id 1PeRgG-0007cP-GQ + for bug-parted@gnu.org; Sun, 16 Jan 2011 07:26:01 -0500 +Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) + (envelope-from <jim@meyering.net>) id 1PeRgF-0003PP-7D + for bug-parted@gnu.org; Sun, 16 Jan 2011 07:26:00 -0500 +Received: from mx.meyering.net ([82.230.74.64]:52182) + by eggs.gnu.org with esmtp (Exim 4.71) + (envelope-from <jim@meyering.net>) id 1PeRgF-0003PL-0K + for bug-parted@gnu.org; Sun, 16 Jan 2011 07:25:59 -0500 +Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000) + id 5C38F60466; Sun, 16 Jan 2011 13:25:56 +0100 (CET) +From: Jim Meyering <jim@meyering.net> +To: bug-parted@gnu.org +Date: Sun, 16 Jan 2011 13:25:56 +0100 +Message-ID: <8762tpox0r.fsf@meyering.net> +Lines: 67 +MIME-Version: 1.0 +Content-Type: text/plain +X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) +Subject: treat "1MiB" like "1048576B" +X-BeenThere: bug-parted@gnu.org +X-Mailman-Version: 2.1.5 +Precedence: list +List-Id: Bug reports for the GNU Parted disk partition editor + <bug-parted.gnu.org> +List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-parted>, + <mailto:bug-parted-request@gnu.org?subject=unsubscribe> +List-Archive: <http://lists.gnu.org/archive/html/bug-parted> +List-Post: <mailto:bug-parted@gnu.org> +List-Help: <mailto:bug-parted-request@gnu.org?subject=help> +List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-parted>, + <mailto:bug-parted-request@gnu.org?subject=subscribe> +Sender: bug-parted-bounces+otavio=debian.org@gnu.org +Errors-To: bug-parted-bounces+otavio=debian.org@gnu.org + +[ I noticed that using a starting address of "1MiB" evokes a warning, + along with the obviously unintended start sector of 34: + + parted -s -- $dev mklabel gpt mkpart PARTITION-NAME 1MiB -34s + Warning: The resulting partition is not properly aligned for best performance. + + While the following, with "1048576B", works fine and creates the partition + starting at the desired 1MiB address: + + parted -s -- $dev mklabel gpt mkpart PARTITION-NAME 1048576B -34s + ] + +I made parted tell me why it was treating "1MiB" differently from +"1048576B". Bottom line is that if you use a large unit, like MiB, it +assumes you're being sloppy, but if you specify bytes or sectors, you +require exactness (radius = 0). That may have made sense when people +used sloppy units like MB (1,000,000), but obviously does not hold for +most people who bother to type "MiB". + +Here's a proposed patch to make the command I gave work the way I +intended. Opinions welcome. On one hand, I don't particularly like +treating 1MiB differently from 1MB, but if someone is using 1MB and +intends 1MiB, they need a little wake up call (or some RTFM). +[the full patch will include a documentation update as well as +a couple of tests to illustrate/exercise the difference. ] + +In the mean time, to get the proper 1MiB alignment, you'll have to +use an explicit byte or sector count. I prefer byte counts, in spite of +the greater number of digits, because that works the same regardless +of a disk's sector size: + + dev=... + k=1024 m=$((k*k)) + parted -s -- $dev mklabel gpt mkpart P-NAME ${m}B -34s + + +diff --git a/libparted/unit.c b/libparted/unit.c +index 2670c38..59a9644 100644 +--- a/libparted/unit.c ++++ b/libparted/unit.c +@@ -480,6 +480,12 @@ parse_unit_suffix (const char* suffix, PedUnit suggested_unit) + return suggested_unit; + } + ++static bool ++is_power_of_2 (long long n) ++{ ++ return (n & (n - 1)) == 0; ++} ++ + /** + * If \p str contains a valid description of a location on \p dev, then + * \p *sector is modified to describe the location and a geometry is created +@@ -530,6 +536,13 @@ ped_unit_parse_custom (const char* str, const PedDevice* dev, PedUnit unit, + radius = ped_div_round_up (unit_size, dev->sector_size) - 1; + if (radius < 0) + radius = 0; ++ /* If the user specified units in a power of 2, e.g., 1MiB, as in ++ parted -s -- $dev mklabel gpt mkpart P-NAME 1MiB -34s ++ do not use 1MiB as the range. Rather, presume that they ++ are specifying precisely the starting or ending number, ++ and treat "1MiB" just as we would treat "1048576B". */ ++ if (is_power_of_2 (unit_size)) ++ radius = 0; + + *sector = num * unit_size / dev->sector_size; + /* negative numbers count from the end */ + +_______________________________________________ +bug-parted mailing list +bug-parted@gnu.org +http://lists.gnu.org/mailman/listinfo/bug-parted diff --git a/recipes/parted/parted_2.3.bb b/recipes/parted/parted_2.3.bb index d2ac303..f3b596c 100644 --- a/recipes/parted/parted_2.3.bb +++ b/recipes/parted/parted_2.3.bb @@ -3,9 +3,11 @@ HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" LICENSE = "GPLv3" SECTION = "console/tools" DEPENDS = "readline util-linux-ng lvm2" +PR = "r1" SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \ file://use_llseek_syscall.patch \ + file://fix-MiB-handling.patch \ " EXTRA_OECONF = "--disable-Werror ac_cv_func_calloc_0_nonnull=yes" -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 12/14] libinih: readd without AUTOREV 2011-02-23 13:07 ` [PATCH 11/14] parted: fix MiB handling Otavio Salvador @ 2011-02-23 13:07 ` Otavio Salvador 2011-02-23 13:07 ` [PATCH 13/14] linux (2.6.37): add 2.6.37.1 stable patch Otavio Salvador 0 siblings, 1 reply; 23+ messages in thread From: Otavio Salvador @ 2011-02-23 13:07 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> --- 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..3296471 --- /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 = "r1" +LICENSE = "BSD" +RDEPENDS_${PN}-dev = "" + +SRCREV = "53c81b2d5641551070947bd69ce4c23f17685804" +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] 23+ messages in thread
* [PATCH 13/14] linux (2.6.37): add 2.6.37.1 stable patch 2011-02-23 13:07 ` [PATCH 12/14] libinih: readd without AUTOREV Otavio Salvador @ 2011-02-23 13:07 ` Otavio Salvador 2011-02-23 13:07 ` [PATCH 14/14] libcap2: 2.16 -> 2.20 Otavio Salvador 2011-02-23 14:34 ` [PATCH 13/14] linux (2.6.37): add 2.6.37.1 stable patch Martin Jansa 0 siblings, 2 replies; 23+ messages in thread From: Otavio Salvador @ 2011-02-23 13:07 UTC (permalink / raw) To: openembedded-devel; +Cc: Otavio Salvador Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- recipes/linux/linux_2.6.37.bb | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/recipes/linux/linux_2.6.37.bb b/recipes/linux/linux_2.6.37.bb index 39c0c08..e11af81 100644 --- a/recipes/linux/linux_2.6.37.bb +++ b/recipes/linux/linux_2.6.37.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r2" +PR = "r3" # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" @@ -20,6 +20,7 @@ DEFAULT_PREFERENCE_visstrim_m10 = "1" # DEFAULT_PREFERENCE_om-gta01 = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.1.bz2;apply=yes;name=stablepatch \ file://defconfig " SRC_URI_append_om-gta02 = " \ @@ -33,3 +34,5 @@ SRC_URI_append_om-gta01 = " \ SRC_URI[kernel.md5sum] = "c8ee37b4fdccdb651e0603d35350b434" SRC_URI[kernel.sha256sum] = "edbf091805414739cf57a3bbfeba9e87f5e74f97e38f04d12060e9e0c71e383a" +SRC_URI[stablepatch.md5sum] = "7693d1d32ed39346cc988e0f027e5890" +SRC_URI[stablepatch.sha256sum] = "c33bfa59828a9ff6916993ec008967a8c1d71a18b743ee15f4280e773ef4baaf" -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 14/14] libcap2: 2.16 -> 2.20 2011-02-23 13:07 ` [PATCH 13/14] linux (2.6.37): add 2.6.37.1 stable patch Otavio Salvador @ 2011-02-23 13:07 ` Otavio Salvador 2011-02-23 14:34 ` [PATCH 13/14] linux (2.6.37): add 2.6.37.1 stable patch Martin Jansa 1 sibling, 0 replies; 23+ messages in thread From: Otavio Salvador @ 2011-02-23 13:07 UTC (permalink / raw) To: openembedded-devel; +Cc: Otavio Salvador Fix compilation with newer kernel headers: | .../tmp/sysroots/.../usr/include/asm/sigcontext.h:28:2: error: | expected specifier-qualifier-list before '__u64' | .../tmp/sysroots/.../usr/include/asm/sigcontext.h:191:2: error: | expected specifier-qualifier-list before '__u64' | make[1]: *** [capsh.o] Error 1 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- recipes/libcap/libcap2-2.16/make.patch | 33 -------------------------------- recipes/libcap/libcap2/make.patch | 30 +++++++++++++++++++++++++++++ recipes/libcap/libcap2_2.16.bb | 28 --------------------------- recipes/libcap/libcap2_2.20.bb | 28 +++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 61 deletions(-) delete mode 100644 recipes/libcap/libcap2-2.16/make.patch create mode 100644 recipes/libcap/libcap2/make.patch delete mode 100644 recipes/libcap/libcap2_2.16.bb create mode 100644 recipes/libcap/libcap2_2.20.bb diff --git a/recipes/libcap/libcap2-2.16/make.patch b/recipes/libcap/libcap2-2.16/make.patch deleted file mode 100644 index b8508e4..0000000 --- a/recipes/libcap/libcap2-2.16/make.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: libcap-2.16/Make.Rules -=================================================================== ---- libcap-2.16.orig/Make.Rules 2008-12-04 08:03:30.000000000 +0100 -+++ libcap-2.16/Make.Rules 2011-01-13 22:51:04.568844000 +0100 -@@ -45,25 +45,18 @@ - KERNEL_HEADERS := $(topdir)/libcap/include - IPATH += -I$(topdir)/libcap/include -I$(KERNEL_HEADERS) - --CC := gcc --CFLAGS := -O2 --BUILD_CC := $(CC) --BUILD_CFLAGS := $(CFLAGS) $(IPATH) --AR := ar --RANLIB := ranlib -+LD=$(CC) -Wl,-x -shared - DEBUG = -g #-DDEBUG - WARNINGS=-fPIC -Wall -Wwrite-strings \ - -Wpointer-arith -Wcast-qual -Wcast-align \ - -Wstrict-prototypes -Wmissing-prototypes \ - -Wnested-externs -Winline -Wshadow --LD=$(CC) -Wl,-x -shared --LDFLAGS := #-g - --SYSTEM_HEADERS = /usr/include -+SYSTEM_HEADERS ?= /usr/include - INCS=$(topdir)/libcap/include/sys/capability.h - LDFLAGS += -L$(topdir)/libcap - CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) $(IPATH) --PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi) -+PAM_CAP := $(shell if [ -f $(SYSTEM_HEADERS)/security/pam_modules.h ]; then echo yes ; else echo no ; fi) - INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) - DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi) - LIBATTR := yes diff --git a/recipes/libcap/libcap2/make.patch b/recipes/libcap/libcap2/make.patch new file mode 100644 index 0000000..57a2cae --- /dev/null +++ b/recipes/libcap/libcap2/make.patch @@ -0,0 +1,30 @@ +--- a/Make.Rules ++++ b/Make.Rules +@@ -47,25 +47,18 @@ + KERNEL_HEADERS := $(topdir)/libcap/include + IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS) + +-CC := gcc +-CFLAGS := -O2 +-BUILD_CC := $(CC) +-BUILD_CFLAGS := $(CFLAGS) $(IPATH) +-AR := ar +-RANLIB := ranlib + DEBUG = -g #-DDEBUG + WARNINGS=-Wall -Wwrite-strings \ + -Wpointer-arith -Wcast-qual -Wcast-align \ + -Wstrict-prototypes -Wmissing-prototypes \ + -Wnested-externs -Winline -Wshadow + LD=$(CC) -Wl,-x -shared +-LDFLAGS := #-g + +-SYSTEM_HEADERS = /usr/include ++SYSTEM_HEADERS ?= /usr/include + INCS=$(topdir)/libcap/include/sys/capability.h + LDFLAGS += -L$(topdir)/libcap + CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) +-PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi) ++PAM_CAP := $(shell if [ -f $(SYSTEM_HEADERS)/security/pam_modules.h ]; then echo yes ; else echo no ; fi) + INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) + DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi) + LIBATTR := yes diff --git a/recipes/libcap/libcap2_2.16.bb b/recipes/libcap/libcap2_2.16.bb deleted file mode 100644 index beb45f2..0000000 --- a/recipes/libcap/libcap2_2.16.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "Libcap is a library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities." -PRIORITY = "optional" -SECTION = "libs" -LICENSE = "GPL" -DEPENDS = "bison-native flex-native attr ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -PR = "r3" - -BUILD_CFLAGS += "-I${S}/libcap/include" -CFLAGS += "-I${S}/libcap/include" -LDFLAGS =+ "-L../libcap" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/libcap2/libcap-${PV}.tar.bz2 \ - file://make.patch \ - " - -S = "${WORKDIR}/libcap-${PV}" - -EXTRA_OEMAKE = "SYSTEM_HEADERS=${STAGING_INCDIR}" - -do_install() { - install -d ${D}${includedir}/sys - install -m 0644 libcap/include/sys/capability.h ${D}${includedir}/sys/ - install -d ${D}${libdir} - oe_libinstall -s -C libcap libcap ${D}${libdir} -} - -SRC_URI[md5sum] = "6e2c9d0f3c3118e41cd07288ba9577ce" -SRC_URI[sha256sum] = "9c5a41a5577d6f702fe4d29e92f91f1d586a2ef272f6b7fa137bae3f0e76cc2f" diff --git a/recipes/libcap/libcap2_2.20.bb b/recipes/libcap/libcap2_2.20.bb new file mode 100644 index 0000000..8f7dc3b --- /dev/null +++ b/recipes/libcap/libcap2_2.20.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Libcap is a library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities." +PRIORITY = "optional" +SECTION = "libs" +LICENSE = "GPL" +DEPENDS = "bison-native flex-native attr ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +PR = "r0" + +BUILD_CFLAGS += "-I${S}/libcap/include" +CFLAGS += "-I${S}/libcap/include" +LDFLAGS =+ "-L../libcap" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/libcap2/libcap-${PV}.tar.bz2 \ + file://make.patch \ + " + +SRC_URI[md5sum] = "10e47ed32ca2214eb0e58780282d27b4" +SRC_URI[sha256sum] = "20e7c1ea4d3d5c410efb3a6ff138dc417912fae316d883460dcd58d9803a9220" + +S = "${WORKDIR}/libcap-${PV}" + +EXTRA_OEMAKE = "SYSTEM_HEADERS=${STAGING_INCDIR}" + +do_install() { + install -d ${D}${includedir}/sys + install -m 0644 libcap/include/sys/capability.h ${D}${includedir}/sys/ + install -d ${D}${libdir} + oe_libinstall -s -C libcap libcap ${D}${libdir} +} -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH 13/14] linux (2.6.37): add 2.6.37.1 stable patch 2011-02-23 13:07 ` [PATCH 13/14] linux (2.6.37): add 2.6.37.1 stable patch Otavio Salvador 2011-02-23 13:07 ` [PATCH 14/14] libcap2: 2.16 -> 2.20 Otavio Salvador @ 2011-02-23 14:34 ` Martin Jansa 2011-02-23 16:22 ` Otavio Salvador 1 sibling, 1 reply; 23+ messages in thread From: Martin Jansa @ 2011-02-23 14:34 UTC (permalink / raw) To: openembedded-devel; +Cc: Otavio Salvador [-- Attachment #1: Type: text/plain, Size: 1441 bytes --] On Wed, Feb 23, 2011 at 01:07:24PM +0000, Otavio Salvador wrote: > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> > --- > recipes/linux/linux_2.6.37.bb | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/recipes/linux/linux_2.6.37.bb b/recipes/linux/linux_2.6.37.bb > index 39c0c08..e11af81 100644 > --- a/recipes/linux/linux_2.6.37.bb > +++ b/recipes/linux/linux_2.6.37.bb > @@ -1,6 +1,6 @@ > require linux.inc > > -PR = "r2" > +PR = "r3" > > # Mark archs/machines that this kernel supports > DEFAULT_PREFERENCE = "-1" > @@ -20,6 +20,7 @@ DEFAULT_PREFERENCE_visstrim_m10 = "1" > # DEFAULT_PREFERENCE_om-gta01 = "1" > > SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ > + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.1.bz2;apply=yes;name=stablepatch \ > file://defconfig " > > SRC_URI_append_om-gta02 = " \ > @@ -33,3 +34,5 @@ SRC_URI_append_om-gta01 = " \ > > SRC_URI[kernel.md5sum] = "c8ee37b4fdccdb651e0603d35350b434" > SRC_URI[kernel.sha256sum] = "edbf091805414739cf57a3bbfeba9e87f5e74f97e38f04d12060e9e0c71e383a" > +SRC_URI[stablepatch.md5sum] = "7693d1d32ed39346cc988e0f027e5890" > +SRC_URI[stablepatch.sha256sum] = "c33bfa59828a9ff6916993ec008967a8c1d71a18b743ee15f4280e773ef4baaf" I'll push mine then :). -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 13/14] linux (2.6.37): add 2.6.37.1 stable patch 2011-02-23 14:34 ` [PATCH 13/14] linux (2.6.37): add 2.6.37.1 stable patch Martin Jansa @ 2011-02-23 16:22 ` Otavio Salvador 0 siblings, 0 replies; 23+ messages in thread From: Otavio Salvador @ 2011-02-23 16:22 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-devel \On Wed, Feb 23, 2011 at 14:34, Martin Jansa <martin.jansa@gmail.com> wrote: > On Wed, Feb 23, 2011 at 01:07:24PM +0000, Otavio Salvador wrote: >> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Sure. Please do. -- 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] 23+ messages in thread
* Re: [PATCH 05/14] cmake.bbclass: use 2.8 modules 2011-02-23 13:07 ` [PATCH 05/14] cmake.bbclass: use 2.8 modules Otavio Salvador 2011-02-23 13:07 ` [PATCH 06/14] cmake.bbclass: use QT_CONF_PATH to support Qt4 projects Otavio Salvador @ 2011-02-23 13:41 ` Phil Blundell 2011-02-23 13:47 ` Otavio Salvador 1 sibling, 1 reply; 23+ messages in thread From: Phil Blundell @ 2011-02-23 13:41 UTC (permalink / raw) To: openembedded-devel; +Cc: Otavio Salvador On Wed, 2011-02-23 at 13:07 +0000, Otavio Salvador wrote: > - 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 This seems a bit fragile (and, presumably, is bad news for anybody who is still using cmake 2.6 for any reason). Isn't there any way to automatically select the version that matches ${STAGING_BINDIR_NATIVE}/cmake or whatever? p. ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 05/14] cmake.bbclass: use 2.8 modules 2011-02-23 13:41 ` [PATCH 05/14] cmake.bbclass: use 2.8 modules Phil Blundell @ 2011-02-23 13:47 ` Otavio Salvador 2011-03-01 2:40 ` Khem Raj 2011-03-01 11:21 ` Phil Blundell 0 siblings, 2 replies; 23+ messages in thread From: Otavio Salvador @ 2011-02-23 13:47 UTC (permalink / raw) To: Phil Blundell; +Cc: openembedded-devel On Wed, Feb 23, 2011 at 13:41, Phil Blundell <philb@gnu.org> wrote: > On Wed, 2011-02-23 at 13:07 +0000, Otavio Salvador wrote: >> - 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 > > This seems a bit fragile (and, presumably, is bad news for anybody who > is still using cmake 2.6 for any reason). Isn't there any way to > automatically select the version that matches > ${STAGING_BINDIR_NATIVE}/cmake or whatever? I see noone using cmake 2.6. In any case cmake will know the "internal" modules directory by itself so it works even if this value doesn't match. This is where it is going to look as fallback and I was using 2.8 without 2.6 for long time without noticing any issue. This seems safe. We could drop the CMAKE_MODULE_PATH if preferred. I just fixed it to 2.8 to reflect the current default one. -- 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] 23+ messages in thread
* Re: [PATCH 05/14] cmake.bbclass: use 2.8 modules 2011-02-23 13:47 ` Otavio Salvador @ 2011-03-01 2:40 ` Khem Raj 2011-03-01 11:12 ` Otavio Salvador 2011-03-01 11:21 ` Phil Blundell 1 sibling, 1 reply; 23+ messages in thread From: Khem Raj @ 2011-03-01 2:40 UTC (permalink / raw) To: openembedded-devel On (23/02/11 13:47), Otavio Salvador wrote: > On Wed, Feb 23, 2011 at 13:41, Phil Blundell <philb@gnu.org> wrote: > > On Wed, 2011-02-23 at 13:07 +0000, Otavio Salvador wrote: > >> - 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 > > > > This seems a bit fragile (and, presumably, is bad news for anybody who > > is still using cmake 2.6 for any reason). Isn't there any way to > > automatically select the version that matches > > ${STAGING_BINDIR_NATIVE}/cmake or whatever? > > I see noone using cmake 2.6. > > In any case cmake will know the "internal" modules directory by itself > so it works even if this value doesn't match. This is where it is > going to look as fallback and I was using 2.8 without 2.6 for long > time without noticing any issue. > > This seems safe. We could drop the CMAKE_MODULE_PATH if preferred. I > just fixed it to 2.8 to reflect the current default one. yeah make it portable for future if no one is using cmake 2.6 > > -- > 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 > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel -- -Khem ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 05/14] cmake.bbclass: use 2.8 modules 2011-03-01 2:40 ` Khem Raj @ 2011-03-01 11:12 ` Otavio Salvador 0 siblings, 0 replies; 23+ messages in thread From: Otavio Salvador @ 2011-03-01 11:12 UTC (permalink / raw) To: openembedded-devel, Phil Blundell On Tue, Mar 1, 2011 at 02:40, Khem Raj <raj.khem@gmail.com> wrote: > On (23/02/11 13:47), Otavio Salvador wrote: ... >> I see noone using cmake 2.6. >> >> In any case cmake will know the "internal" modules directory by itself >> so it works even if this value doesn't match. This is where it is >> going to look as fallback and I was using 2.8 without 2.6 for long >> time without noticing any issue. >> >> This seems safe. We could drop the CMAKE_MODULE_PATH if preferred. I >> just fixed it to 2.8 to reflect the current default one. > > yeah make it portable for future if no one is using cmake 2.6 I did not understand what you meant. You mean to drop CMAKE_MODULE_PATH? -- 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] 23+ messages in thread
* Re: [PATCH 05/14] cmake.bbclass: use 2.8 modules 2011-02-23 13:47 ` Otavio Salvador 2011-03-01 2:40 ` Khem Raj @ 2011-03-01 11:21 ` Phil Blundell 2011-03-01 11:17 ` Otavio Salvador 1 sibling, 1 reply; 23+ messages in thread From: Phil Blundell @ 2011-03-01 11:21 UTC (permalink / raw) To: Otavio Salvador; +Cc: openembedded-devel On Wed, 2011-02-23 at 13:47 +0000, Otavio Salvador wrote: > In any case cmake will know the "internal" modules directory by itself > so it works even if this value doesn't match. This is where it is > going to look as fallback and I was using 2.8 without 2.6 for long > time without noticing any issue. > > This seems safe. We could drop the CMAKE_MODULE_PATH if preferred. I > just fixed it to 2.8 to reflect the current default one. If I understand right, you're saying that the CMAKE_MODULE_PATH doesn't serve any useful purpose since cmake works just fine without it. If that's the case then yes, let's just drop it altogether. p. ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 05/14] cmake.bbclass: use 2.8 modules 2011-03-01 11:21 ` Phil Blundell @ 2011-03-01 11:17 ` Otavio Salvador 0 siblings, 0 replies; 23+ messages in thread From: Otavio Salvador @ 2011-03-01 11:17 UTC (permalink / raw) To: Phil Blundell; +Cc: openembedded-devel On Tue, Mar 1, 2011 at 11:21, Phil Blundell <philb@gnu.org> wrote: > On Wed, 2011-02-23 at 13:47 +0000, Otavio Salvador wrote: >> In any case cmake will know the "internal" modules directory by itself >> so it works even if this value doesn't match. This is where it is >> going to look as fallback and I was using 2.8 without 2.6 for long >> time without noticing any issue. >> >> This seems safe. We could drop the CMAKE_MODULE_PATH if preferred. I >> just fixed it to 2.8 to reflect the current default one. > > If I understand right, you're saying that the CMAKE_MODULE_PATH doesn't > serve any useful purpose since cmake works just fine without it. If > that's the case then yes, let's just drop it altogether. I'll make this change locally and see if it works fine for a build from scratch. In this case, I post the patch. -- 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] 23+ messages in thread
end of thread, other threads:[~2011-03-01 11:19 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-23 13:07 [PATCH 00/14] Patchset waiting for merging on O.S. Systems tree Otavio Salvador
2011-02-23 13:07 ` [PATCH 01/14] qmake_base.bbclass: add generate_qt_config_file task Otavio Salvador
2011-02-23 13:07 ` [PATCH 02/14] cmake: drop 2.6.4 as it is not used by any distro Otavio Salvador
2011-02-23 13:07 ` [PATCH 03/14] cmake: update from 2.8.2 to 2.8.3 Otavio Salvador
2011-02-23 13:07 ` [PATCH 04/14] cmake: add OE qt4-tools-{native,sdk} support Otavio Salvador
2011-02-23 13:07 ` [PATCH 05/14] cmake.bbclass: use 2.8 modules Otavio Salvador
2011-02-23 13:07 ` [PATCH 06/14] cmake.bbclass: use QT_CONF_PATH to support Qt4 projects Otavio Salvador
2011-02-23 13:07 ` [PATCH 07/14] ntfsprogs: add 2.0.0 Otavio Salvador
2011-02-23 13:07 ` [PATCH 08/14] syslinux: add isolinux and chain packages Otavio Salvador
2011-02-23 13:07 ` [PATCH 09/14] contrib/openembedded-essential (debian): rename to be version agnostic Otavio Salvador
2011-02-23 13:07 ` [PATCH 10/14] contrib/openembedded-essential (debian): depends on chrpath Otavio Salvador
2011-02-23 13:07 ` [PATCH 11/14] parted: fix MiB handling Otavio Salvador
2011-02-23 13:07 ` [PATCH 12/14] libinih: readd without AUTOREV Otavio Salvador
2011-02-23 13:07 ` [PATCH 13/14] linux (2.6.37): add 2.6.37.1 stable patch Otavio Salvador
2011-02-23 13:07 ` [PATCH 14/14] libcap2: 2.16 -> 2.20 Otavio Salvador
2011-02-23 14:34 ` [PATCH 13/14] linux (2.6.37): add 2.6.37.1 stable patch Martin Jansa
2011-02-23 16:22 ` Otavio Salvador
2011-02-23 13:41 ` [PATCH 05/14] cmake.bbclass: use 2.8 modules Phil Blundell
2011-02-23 13:47 ` Otavio Salvador
2011-03-01 2:40 ` Khem Raj
2011-03-01 11:12 ` Otavio Salvador
2011-03-01 11:21 ` Phil Blundell
2011-03-01 11:17 ` 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.