Skip to contentSkip to conversation

Patchset waiting for merging on O.S. Systems tree

PATCH In review Otavio Salvador 4 participants 23 messages Feb 23, 2011 – Mar 1, 2011

lore
Share & tools
lore
#0 lore raw

cover Patchset waiting for merging on O.S. Systems tree

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,

#1 lore raw

PATCH 1/14 qmake_base.bbclass: add generate_qt_config_file task

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.

---
 classes/qmake_base.bbclass |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
classes/qmake_base.bbclass +14 -0
index cf905a7..cc3297c 100644
@@ -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++)
Signature · 1 line
1.7.2.3
#2 lore raw

PATCH 2/14 cmake: drop 2.6.4 as it is not used by any distro

---
 .../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
recipes/cmake/cmake-2.6.4/fix_fortify_source_compilation.patch deleted +0 -32
deleted file mode 100644
index 316ab0c..0000000
@@ -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);
recipes/cmake/cmake-native_2.6.4.bb deleted +0 -10
deleted file mode 100644
index aab6b62..0000000
@@ -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"
recipes/cmake/cmake_2.6.4.bb deleted +0 -11
deleted file mode 100644
index b5a47a8..0000000
@@ -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"
Signature · 1 line
1.7.2.3
#3 lore raw

PATCH 3/14 cmake: update from 2.8.2 to 2.8.3

---
 .../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
recipes/cmake/cmake-2.8.2/dont-run-cross-binaries.patch deleted +0 -13
deleted file mode 100644
index 4a006f9..0000000
@@ -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
recipes/cmake/cmake-2.8.3/dont-run-cross-binaries.patch new file +13 -0
new file mode 100644
index 0000000..4a006f9
@@ -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
recipes/cmake/cmake-native_2.8.2.bb deleted +0 -12
deleted file mode 100644
index c7b3d80..0000000
@@ -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
-}
recipes/cmake/cmake-native_2.8.3.bb new file +12 -0
new file mode 100644
index 0000000..e04885f
@@ -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
+}
recipes/cmake/cmake-sdk_2.8.2.bb deleted +0 -12
deleted file mode 100644
index 2c51a49..0000000
@@ -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
-}
recipes/cmake/cmake-sdk_2.8.3.bb new file +12 -0
new file mode 100644
index 0000000..5035b81
@@ -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
+}
recipes/cmake/cmake_2.8.2.bb deleted +0 -46

46 lines not on this page · raw message

recipes/cmake/cmake_2.8.3.bb new file +46 -0

46 lines not on this page · raw message

Signature · 1 line
1.7.2.3
#4 lore raw

PATCH 4/14 cmake: add OE qt4-tools-{native,sdk} support

* make it find qmake2, moc4 and others
* convert to INC_PR

---
 .../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
recipes/cmake/cmake-2.8.3/support-oe-qt4-tools-names.patch new file +85 -0
new file mode 100644
index 0000000..b456923
@@ -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
+     )
recipes/cmake/cmake-native_2.8.3.bb +1 -1
index e04885f..fa5e160 100644
@@ -1,7 +1,7 @@
 inherit native
 require cmake.inc
 
-PR = "r1"
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "a76a44b93acf5e3badda9de111385921"
 SRC_URI[sha256sum] = "689ed02786b5cefa5515c7716784ee82a82e8ece6be5a3d629ac3cc0c05fc288"
recipes/cmake/cmake-sdk_2.8.3.bb +1 -1
index 5035b81..2dd7a17 100644
@@ -1,7 +1,7 @@
 inherit sdk
 require cmake.inc
 
-PR = "r1"
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "a76a44b93acf5e3badda9de111385921"
 SRC_URI[sha256sum] = "689ed02786b5cefa5515c7716784ee82a82e8ece6be5a3d629ac3cc0c05fc288"
recipes/cmake/cmake.inc +3 -2
index ef6f5aa..814743e 100644
@@ -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
 
recipes/cmake/cmake_2.8.3.bb +2 -0
index 8c96388..cb5f7f7 100644
@@ -1,5 +1,7 @@
 require cmake.inc
 
+PR = "${INC_PR}.0"
+
 inherit cmake
 
 DEPENDS += "curl expat zlib"
Signature · 1 line
1.7.2.3
#5 lore raw

PATCH 5/14 cmake.bbclass: use 2.8 modules

---
 classes/cmake.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
classes/cmake.bbclass +1 -1
index 29248e6..97347f2 100644
@@ -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
Signature · 1 line
1.7.2.3
#6 lore raw

PATCH 6/14 cmake.bbclass: use QT_CONF_PATH to support Qt4 projects

---
 classes/cmake.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
classes/cmake.bbclass +2 -0
index 97347f2..d2d1c66 100644
@@ -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
Signature · 1 line
1.7.2.3
#7 lore raw

PATCH 7/14 ntfsprogs: add 2.0.0

This recipe has been imported from O.S. Systems tree and hence starts at revision r2.

---
 .../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
recipes/ntfsprogs/ntfsprogs/skip-erange-errors.patch new file +30 -0
new file mode 100644
index 0000000..7292d77
@@ -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;
++			}
+ 		}
+ 
+ 		/*
recipes/ntfsprogs/ntfsprogs_2.0.0.bb new file +15 -0
new file mode 100644
index 0000000..b41985d
@@ -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"
Signature · 1 line
1.7.2.3
#8 lore raw

PATCH 8/14 syslinux: add isolinux and chain packages

This syncs the package recipe with the O.S. Systems tree adding more packages and fixing GNU_HASH issues.

---
 recipes/syslinux/syslinux_3.82.bb |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
recipes/syslinux/syslinux_3.82.bb +7 -4
index f899d9f..fcb066d 100644
@@ -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"
Signature · 1 line
1.7.2.3
#9 lore raw

PATCH 9/14 contrib/openembedded-essential (debian): rename to be version agnostic

---
 .../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
contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog deleted +0 -34
deleted file mode 100644
index 8485f3e..0000000
@@ -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 <[email protected]>  Mon, 19 Jan 2008 14:25:00 +0100
-
-openembedded-essential (1.3) unstable; urgency=low
-
-  * add gfortran as dependency to complement a5c7b007eaa675cc904f5285291d2f8a597efc84
-
- -- Rolf Leggewie <[email protected]>  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 <[email protected]>  Wed,  8 Nov 2006 11:17:42 +0100
-
-openembedded-essential (1.1) unstable; urgency=low
-
-  * added gawk
-
- -- Marcin Juszkiewicz <[email protected]>  Wed,  8 Nov 2006 11:17:42 +0100
-
-openembedded-essential (1.0-1) unstable; urgency=low
-
-  * Initial release
-
- -- Marcin Juszkiewicz <[email protected]>  Tue, 17 Oct 2006 12:05:35 +0200
-
contrib/distro-packages/debian/openembedded-essential-1.4/debian/compat deleted +0 -1
deleted file mode 100644
index 7ed6ff8..0000000
@@ -1 +0,0 @@
-5
contrib/distro-packages/debian/openembedded-essential-1.4/debian/control deleted +0 -17
deleted file mode 100644
index 9f1e095..0000000
@@ -1,17 +0,0 @@
-Source: openembedded-essential
-Section: devel
-Priority: optional
-Maintainer: Marcin Juszkiewicz <[email protected]>
-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.
contrib/distro-packages/debian/openembedded-essential-1.4/debian/copyright deleted +0 -12
deleted file mode 100644
index 9e4905f..0000000
@@ -1,12 +0,0 @@
-This package was debianized by Marcin Juszkiewicz <[email protected]> on
-Tue, 17 Oct 2006 12:05:35 +0200.
-
-Upstream Author: Marcin Juszkiewicz <[email protected]>
-
-Copyright: 
-2006 Marcin Juszkiewicz <[email protected]>
-
-License: GPLv2
-
-The Debian packaging is (C) 2006, Marcin Juszkiewicz <[email protected]> and
-is licensed under the GPLv2, see `/usr/share/common-licenses/GPL-2'.
contrib/distro-packages/debian/openembedded-essential-1.4/debian/rules deleted +0 -21
deleted file mode 100755
index 22ac384..0000000
@@ -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
contrib/distro-packages/debian/openembedded-essential-1.4/ubuntu.patch deleted +0 -22
deleted file mode 100644
index 80863d5..0000000
@@ -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 <[email protected]>  Thu, 24 Jan 2008 13:49:26 +0100
-+
- openembedded-essential (1.4) unstable; urgency=low
- 
-   * remove gfortran from dependency after a5c7b007eaa675cc904f5285291d2f8a597efc84 caused controversy.
contrib/distro-packages/debian/openembedded-essential/debian/changelog new file +34 -0
new file mode 100644
index 0000000..8485f3e
@@ -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 <[email protected]>  Mon, 19 Jan 2008 14:25:00 +0100
+
+openembedded-essential (1.3) unstable; urgency=low
+
+  * add gfortran as dependency to complement a5c7b007eaa675cc904f5285291d2f8a597efc84
+
+ -- Rolf Leggewie <[email protected]>  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 <[email protected]>  Wed,  8 Nov 2006 11:17:42 +0100
+
+openembedded-essential (1.1) unstable; urgency=low
+
+  * added gawk
+
+ -- Marcin Juszkiewicz <[email protected]>  Wed,  8 Nov 2006 11:17:42 +0100
+
+openembedded-essential (1.0-1) unstable; urgency=low
+
+  * Initial release
+
+ -- Marcin Juszkiewicz <[email protected]>  Tue, 17 Oct 2006 12:05:35 +0200
+
contrib/distro-packages/debian/openembedded-essential/debian/compat new file +1 -0
new file mode 100644
index 0000000..7ed6ff8
@@ -0,0 +1 @@
+5
contrib/distro-packages/debian/openembedded-essential/debian/control new file +17 -0
new file mode 100644
index 0000000..9f1e095
@@ -0,0 +1,17 @@
+Source: openembedded-essential
+Section: devel
+Priority: optional
+Maintainer: Marcin Juszkiewicz <[email protected]>
+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.
contrib/distro-packages/debian/openembedded-essential/debian/copyright new file +12 -0
new file mode 100644
index 0000000..9e4905f
@@ -0,0 +1,12 @@
+This package was debianized by Marcin Juszkiewicz <[email protected]> on
+Tue, 17 Oct 2006 12:05:35 +0200.
+
+Upstream Author: Marcin Juszkiewicz <[email protected]>
+
+Copyright: 
+2006 Marcin Juszkiewicz <[email protected]>
+
+License: GPLv2
+
+The Debian packaging is (C) 2006, Marcin Juszkiewicz <[email protected]> and
+is licensed under the GPLv2, see `/usr/share/common-licenses/GPL-2'.
contrib/distro-packages/debian/openembedded-essential/debian/rules new file +21 -0
new file mode 100755
index 0000000..22ac384
@@ -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
contrib/distro-packages/debian/openembedded-essential/ubuntu.patch new file +22 -0
new file mode 100644
index 0000000..80863d5
@@ -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 <[email protected]>  Thu, 24 Jan 2008 13:49:26 +0100
++
+ openembedded-essential (1.4) unstable; urgency=low
+ 
+   * remove gfortran from dependency after a5c7b007eaa675cc904f5285291d2f8a597efc84 caused controversy.
Signature · 1 line
1.7.2.3
#10 lore raw

PATCH 10/14 contrib/openembedded-essential (debian): depends on chrpath

---
 .../debian/openembedded-essential/debian/changelog |    6 ++++++
 .../debian/openembedded-essential/debian/control   |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)
contrib/distro-packages/debian/openembedded-essential/debian/changelog +6 -0
index 8485f3e..afd198a 100644
@@ -1,3 +1,9 @@
+openembedded-essential (1.5) unstable; urgency=low
+
+  * add chrpath as dependency.
+
+ -- Otavio Salvador <[email protected]>  Fri, 18 Feb 2011 02:00:59 +0000
+
 openembedded-essential (1.4) unstable; urgency=low
 
   * remove gfortran from dependency after a5c7b007eaa675cc904f5285291d2f8a597efc84 caused controversy.
contrib/distro-packages/debian/openembedded-essential/debian/control +1 -1
index 9f1e095..f751672 100644
@@ -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
Signature · 1 line
1.7.2.3
#11 lore raw

PATCH 11/14 parted: fix MiB handling

---
 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
recipes/parted/files/fix-MiB-handling.patch new file +130 -0
new file mode 100644
index 0000000..db4945f
@@ -0,0 +1,130 @@
+Delivered-To: [email protected]
+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: <[email protected]>
+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 [email protected] 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 [email protected] does not designate 70.103.162.29 as permitted sender) [email protected]
+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 <[email protected]>)
+	id 1PeRgN-00069u-NM
+	for [email protected]; 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 [email protected]; 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 [email protected]; Sun, 16 Jan 2011 07:26:01 -0500
+Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
+	(envelope-from <[email protected]>) id 1PeRgF-0003PP-7D
+	for [email protected]; 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 <[email protected]>) id 1PeRgF-0003PL-0K
+	for [email protected]; 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 <[email protected]>
+To: [email protected]
+Date: Sun, 16 Jan 2011 13:25:56 +0100
+Message-ID: <[email protected]>
+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: [email protected]
+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:[email protected]?subject=unsubscribe>
+List-Archive: <http://lists.gnu.org/archive/html/bug-parted>
+List-Post: <mailto:[email protected]>
+List-Help: <mailto:[email protected]?subject=help>
+List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-parted>,
+	<mailto:[email protected]?subject=subscribe>
+Sender: [email protected]
+Errors-To: [email protected]
+
+[ 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
[email protected]
+http://lists.gnu.org/mailman/listinfo/bug-parted
recipes/parted/parted_2.3.bb +2 -0
index d2ac303..f3b596c 100644
@@ -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"
Signature · 1 line
1.7.2.3
#12 lore raw

PATCH 12/14 libinih: readd without AUTOREV

This provides a C and C++ INI library that can be statically linked into projects.

---
 recipes/libinih/libinih_git.bb |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
 create mode 100644 recipes/libinih/libinih_git.bb
recipes/libinih/libinih_git.bb new file +14 -0
new file mode 100644
index 0000000..3296471
@@ -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
Signature · 1 line
1.7.2.3
#13 lore raw

PATCH 13/14 linux (2.6.37): add 2.6.37.1 stable patch

---
 recipes/linux/linux_2.6.37.bb |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
recipes/linux/linux_2.6.37.bb +4 -1
index 39c0c08..e11af81 100644
@@ -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"
Signature · 1 line
1.7.2.3
#14 lore raw

PATCH 14/14 libcap2: 2.16 -> 2.20

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
---
 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
recipes/libcap/libcap2-2.16/make.patch deleted +0 -33
deleted file mode 100644
index b8508e4..0000000
@@ -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
recipes/libcap/libcap2/make.patch new file +30 -0
new file mode 100644
index 0000000..57a2cae
@@ -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
recipes/libcap/libcap2_2.16.bb deleted +0 -28
deleted file mode 100644
index beb45f2..0000000
@@ -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"
recipes/libcap/libcap2_2.20.bb new file +28 -0
new file mode 100644
index 0000000..8f7dc3b
@@ -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}
+}
Signature · 1 line
1.7.2.3
#15 lore raw

Re: [PATCH 13/14] linux (2.6.37): add 2.6.37.1 stable patch

In reply to Otavio Salvador
Quoted 26 lines · Otavio Salvador
---
 recipes/linux/linux_2.6.37.bb |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
recipes/linux/linux_2.6.37.bb +2 -1
index 39c0c08..e11af81 100644
@@ -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 = " \

recipes/linux/linux_2.6.37.bb SRC_URI_append_om-gta01 = " \ · line 38

Quoted 5 lines
recipes/linux/linux_2.6.37.bb +2 -0
@@ -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 :).

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#16 lore raw

Re: [PATCH 13/14] linux (2.6.37): add 2.6.37.1 stable patch

Quoted 2 lines · Martin Jansa
Quoted 1 line · Otavio Salvador

Sure. Please do.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
#17 lore raw

Re: [PATCH 05/14] cmake.bbclass: use 2.8 modules

In reply to Otavio Salvador

classes/cmake.bbclass cmake_do_generate_toolchain_file() { · line 46

Quoted 2 lines · Otavio Salvador
classes/cmake.bbclass +1 -1
-  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.

#18 lore raw

Re: [PATCH 05/14] cmake.bbclass: use 2.8 modules

Quoted 8 lines · Phil Blundell
Quoted 2 lines · Otavio Salvador

-  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.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
#19 lore raw

Re: [PATCH 05/14] cmake.bbclass: use 2.8 modules

Quoted 12 lines · Otavio Salvador
Quoted 8 lines · Phil Blundell
Quoted 2 lines · Otavio Salvador

-  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.

Quoted 7 lines

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

Quoted 10 lines
Signature · 9 lines
-- 
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
-Khem
#20 lore raw

Re: [PATCH 05/14] cmake.bbclass: use 2.8 modules

Quoted 1 line · Khem Raj

On (23/02/11 13:47), Otavio Salvador wrote:

...

Quoted 11 lines
Quoted 9 lines

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?

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
#21 lore raw

Re: [PATCH 05/14] cmake.bbclass: use 2.8 modules

In reply to Otavio Salvador
Quoted 7 lines · Otavio Salvador

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.

#22 lore raw

Re: [PATCH 05/14] cmake.bbclass: use 2.8 modules

Quoted 6 lines · Phil Blundell
Quoted 5 lines · Otavio Salvador

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.

Quoted 6 lines
Quoted 2 lines

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.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br