* [PATCH 0/4] cmake and util-linux updates
@ 2012-11-30 0:00 Saul Wold
2012-11-30 0:00 ` [PATCH 1/4] cmake: Update to 2.8.10.1 Saul Wold
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Saul Wold @ 2012-11-30 0:00 UTC (permalink / raw)
To: openembedded-core
Richard,
I have done futher testing with cmake and I am happy with it. I
also worked out my issues with util-linux and have an update for
sysvinit since util-linux added utmpdump.
The build-appliance-image is a tweak to allow us to set the SRCREV
automagically from a config file via an override.
Consolidated pull coming later after MUT finishes building.
Sau!
Saul Wold (4):
cmake: Update to 2.8.10.1
sysvinit: Update ALTERNATIVES List for utmpdump
util-linux: Update to 2.22.1
build-appliance-image: Allow SRCREV to be overriden
meta/recipes-core/images/build-appliance-image.bb | 2 +-
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 4 +-
meta/recipes-core/util-linux/util-linux.inc | 21 +++++-----
.../util-linux/add-aarch64-support.patch | 18 ---------
.../util-linux/util-linux/configure-sbindir.patch | 15 ++++---
.../util-linux/util-linux/fix-configure.patch | 20 ++++++++++
.../util-linux/uclibc-__progname-conflict.patch | 14 +++----
.../util-linux-ng-replace-siginterrupt.patch | 15 +++----
.../{util-linux_2.21.2.bb => util-linux_2.22.1.bb} | 10 ++---
.../cmake/cmake-native_2.8.10.1.bb | 4 ++
meta/recipes-devtools/cmake/cmake-native_2.8.8.bb | 8 ----
meta/recipes-devtools/cmake/cmake.inc | 3 ++
.../cmake/cmake/dont-run-cross-binaries.patch | 19 ++++-----
.../cmake/cmake/support-oe-qt4-tools-names.patch | 46 +++++++++++-----------
.../cmake/{cmake_2.8.8.bb => cmake_2.8.10.1.bb} | 3 --
15 files changed, 105 insertions(+), 97 deletions(-)
delete mode 100644 meta/recipes-core/util-linux/util-linux/add-aarch64-support.patch
create mode 100644 meta/recipes-core/util-linux/util-linux/fix-configure.patch
rename meta/recipes-core/util-linux/{util-linux_2.21.2.bb => util-linux_2.22.1.bb} (85%)
create mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.10.1.bb
delete mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.8.bb
rename meta/recipes-devtools/cmake/{cmake_2.8.8.bb => cmake_2.8.10.1.bb} (88%)
--
1.8.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/4] cmake: Update to 2.8.10.1
2012-11-30 0:00 [PATCH 0/4] cmake and util-linux updates Saul Wold
@ 2012-11-30 0:00 ` Saul Wold
2012-11-30 0:00 ` [PATCH 2/4] sysvinit: Update ALTERNATIVES List for utmpdump Saul Wold
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Saul Wold @ 2012-11-30 0:00 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../cmake/cmake-native_2.8.10.1.bb | 4 ++
meta/recipes-devtools/cmake/cmake-native_2.8.8.bb | 8 ----
meta/recipes-devtools/cmake/cmake.inc | 3 ++
.../cmake/cmake/dont-run-cross-binaries.patch | 19 ++++-----
.../cmake/cmake/support-oe-qt4-tools-names.patch | 46 +++++++++++-----------
.../cmake/{cmake_2.8.8.bb => cmake_2.8.10.1.bb} | 3 --
6 files changed, 40 insertions(+), 43 deletions(-)
create mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.10.1.bb
delete mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.8.bb
rename meta/recipes-devtools/cmake/{cmake_2.8.8.bb => cmake_2.8.10.1.bb} (88%)
diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.10.1.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.10.1.bb
new file mode 100644
index 0000000..ca81810
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake-native_2.8.10.1.bb
@@ -0,0 +1,4 @@
+require cmake.inc
+inherit native
+
+PR = "${INC_PR}.0"
diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.8.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.8.bb
deleted file mode 100644
index 03d57d1..0000000
--- a/meta/recipes-devtools/cmake/cmake-native_2.8.8.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require cmake.inc
-inherit native
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "ba74b22c788a0c8547976b880cd02b17"
-SRC_URI[sha256sum] = "2b59897864d6220ff20aa8eac64cac8994e004898a1c0f899c8cb4d7b7570b46"
-
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 6dc319c..97059aa 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -16,6 +16,9 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}"
SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
file://support-oe-qt4-tools-names.patch"
+SRC_URI[md5sum] = "aabf16d8e957f99921a0095885381373"
+SRC_URI[sha256sum] = "dbfb9d609e8fdb6f0947993246c11e2ee5d47944d6e7bd9314463b31e420e6e0"
+
inherit autotools
do_configure () {
diff --git a/meta/recipes-devtools/cmake/cmake/dont-run-cross-binaries.patch b/meta/recipes-devtools/cmake/cmake/dont-run-cross-binaries.patch
index 4eb1794..0c059f1 100644
--- a/meta/recipes-devtools/cmake/cmake/dont-run-cross-binaries.patch
+++ b/meta/recipes-devtools/cmake/cmake/dont-run-cross-binaries.patch
@@ -7,16 +7,17 @@ Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-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 @@
+Index: cmake-2.8.10.1/CMakeLists.txt
+===================================================================
+--- cmake-2.8.10.1.orig/CMakeLists.txt
++++ cmake-2.8.10.1/CMakeLists.txt
+@@ -588,7 +588,8 @@ mark_as_advanced(CMAKE_STRICT)
# build the remaining subdirectories
- ADD_SUBDIRECTORY(Source)
--ADD_SUBDIRECTORY(Utilities)
+ 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_subdirectory(Utilities)
+ add_subdirectory(Tests)
- # add a test
+ if(BUILD_TESTING)
diff --git a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
index 147c249..258971b 100644
--- a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
+++ b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
@@ -11,88 +11,88 @@ Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-Index: cmake-2.8.5-rc3/Modules/FindQt4.cmake
+Index: cmake-2.8.10.1/Modules/FindQt4.cmake
===================================================================
---- cmake-2.8.5-rc3.orig/Modules/FindQt4.cmake 2011-06-27 14:41:05.000000000 +0000
-+++ cmake-2.8.5-rc3/Modules/FindQt4.cmake 2011-07-08 15:31:58.057170949 +0000
-@@ -473,7 +473,7 @@
+--- cmake-2.8.10.1.orig/Modules/FindQt4.cmake
++++ cmake-2.8.10.1/Modules/FindQt4.cmake
+@@ -497,7 +497,7 @@ get_filename_component(qt_install_versio
# 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"
-@@ -944,13 +944,13 @@
- ENDIF(QT_QMAKE_CHANGED)
-
- FIND_PROGRAM(QT_MOC_EXECUTABLE
+-find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac
++find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac
+ PATHS
+ ENV QTDIR
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
+@@ -982,13 +982,13 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
+ endif()
+
+ find_program(QT_MOC_EXECUTABLE
- NAMES moc-qt4 moc
+ NAMES moc-qt4 moc4 moc
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
)
- FIND_PROGRAM(QT_UIC_EXECUTABLE
+ find_program(QT_UIC_EXECUTABLE
- NAMES uic-qt4 uic
+ NAMES uic-qt4 uic4 uic
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
)
-@@ -962,49 +962,49 @@
+@@ -1000,49 +1000,49 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
)
- FIND_PROGRAM(QT_RCC_EXECUTABLE
+ find_program(QT_RCC_EXECUTABLE
- NAMES rcc
+ NAMES rcc4 rcc
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
)
- FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE
+ find_program(QT_DBUSCPP2XML_EXECUTABLE
- NAMES qdbuscpp2xml
+ NAMES qdbuscpp2xml4 qdbuscpp2xml
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
)
- FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE
+ find_program(QT_DBUSXML2CPP_EXECUTABLE
- NAMES qdbusxml2cpp
+ NAMES qdbusxml2cpp4 qdbusxml2cpp
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
)
- FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
+ find_program(QT_LUPDATE_EXECUTABLE
- NAMES lupdate-qt4 lupdate
+ NAMES lupdate-qt4 lupdate4 lupdate
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
)
- FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
+ find_program(QT_LRELEASE_EXECUTABLE
- NAMES lrelease-qt4 lrelease
+ NAMES lrelease-qt4 lrelease4 lrelease
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
)
- FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE
+ find_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE
- NAMES qcollectiongenerator-qt4 qcollectiongenerator
+ NAMES qcollectiongenerator-qt4 qcollectiongenerator4 qcollectiongenerator
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
)
- FIND_PROGRAM(QT_DESIGNER_EXECUTABLE
+ find_program(QT_DESIGNER_EXECUTABLE
- NAMES designer-qt4 designer
+ NAMES designer-qt4 designer4 designer
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
)
- FIND_PROGRAM(QT_LINGUIST_EXECUTABLE
+ find_program(QT_LINGUIST_EXECUTABLE
- NAMES linguist-qt4 linguist
+ NAMES linguist-qt4 linguist4 linguist
PATHS ${QT_BINARY_DIR}
diff --git a/meta/recipes-devtools/cmake/cmake_2.8.8.bb b/meta/recipes-devtools/cmake/cmake_2.8.10.1.bb
similarity index 88%
rename from meta/recipes-devtools/cmake/cmake_2.8.8.bb
rename to meta/recipes-devtools/cmake/cmake_2.8.10.1.bb
index 8665dc3..9e1b802 100644
--- a/meta/recipes-devtools/cmake/cmake_2.8.8.bb
+++ b/meta/recipes-devtools/cmake/cmake_2.8.10.1.bb
@@ -8,9 +8,6 @@ PR = "${INC_PR}.0"
SRC_URI += "file://dont-run-cross-binaries.patch"
-SRC_URI[md5sum] = "ba74b22c788a0c8547976b880cd02b17"
-SRC_URI[sha256sum] = "2b59897864d6220ff20aa8eac64cac8994e004898a1c0f899c8cb4d7b7570b46"
-
# Strip ${prefix} from ${docdir}, set result into docdir_stripped
python () {
prefix=d.getVar("prefix", True)
--
1.8.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/4] sysvinit: Update ALTERNATIVES List for utmpdump
2012-11-30 0:00 [PATCH 0/4] cmake and util-linux updates Saul Wold
2012-11-30 0:00 ` [PATCH 1/4] cmake: Update to 2.8.10.1 Saul Wold
@ 2012-11-30 0:00 ` Saul Wold
2012-11-30 0:00 ` [PATCH 3/4] util-linux: Update to 2.22.1 Saul Wold
2012-11-30 0:00 ` [PATCH 4/4] build-appliance-image: Allow SRCREV to be overriden Saul Wold
3 siblings, 0 replies; 5+ messages in thread
From: Saul Wold @ 2012-11-30 0:00 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
index 1647a0f..de073b8 100644
--- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
@@ -5,7 +5,7 @@ SECTION = "base"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4"
-PR = "r8"
+PR = "r9"
RDEPENDS_${PN} = "${PN}-inittab"
@@ -27,7 +27,7 @@ B = "${S}/src"
inherit update-alternatives
-ALTERNATIVE_${PN} = "init mountpoint halt reboot runlevel shutdown poweroff last mesg wall"
+ALTERNATIVE_${PN} = "init mountpoint halt reboot runlevel shutdown poweroff last mesg utmpdump wall"
ALTERNATIVE_PRIORITY = "200"
--
1.8.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/4] util-linux: Update to 2.22.1
2012-11-30 0:00 [PATCH 0/4] cmake and util-linux updates Saul Wold
2012-11-30 0:00 ` [PATCH 1/4] cmake: Update to 2.8.10.1 Saul Wold
2012-11-30 0:00 ` [PATCH 2/4] sysvinit: Update ALTERNATIVES List for utmpdump Saul Wold
@ 2012-11-30 0:00 ` Saul Wold
2012-11-30 0:00 ` [PATCH 4/4] build-appliance-image: Allow SRCREV to be overriden Saul Wold
3 siblings, 0 replies; 5+ messages in thread
From: Saul Wold @ 2012-11-30 0:00 UTC (permalink / raw)
To: openembedded-core
Fix the configure-sbindir test, which was not working correctly
add a patch to configure to correctly test if the prefixes are
conatined in libdir so they don't duplicate.
Removed aarch64 patch since it been merged into this version
Rebased util-linux-ng-replace-siginterrupt.patch
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/util-linux/util-linux.inc | 21 ++++++++++++---------
.../util-linux/util-linux/add-aarch64-support.patch | 18 ------------------
.../util-linux/util-linux/configure-sbindir.patch | 15 ++++++++++-----
.../util-linux/util-linux/fix-configure.patch | 20 ++++++++++++++++++++
.../util-linux/uclibc-__progname-conflict.patch | 14 +++++++-------
.../util-linux-ng-replace-siginterrupt.patch | 15 ++++++++-------
.../{util-linux_2.21.2.bb => util-linux_2.22.1.bb} | 10 +++++-----
7 files changed, 62 insertions(+), 51 deletions(-)
delete mode 100644 meta/recipes-core/util-linux/util-linux/add-aarch64-support.patch
create mode 100644 meta/recipes-core/util-linux/util-linux/fix-configure.patch
rename meta/recipes-core/util-linux/{util-linux_2.21.2.bb => util-linux_2.22.1.bb} (85%)
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index f2f9a04..058f06f 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -8,12 +8,14 @@ SECTION = "base"
LICENSE = "GPLv2+ & LGPLv2.1+ & BSD"
LIC_FILES_CHKSUM = "file://README.licensing;md5=9c920d811858a74b67a36ba23cbaa95f \
- file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
- file://Documentation/licenses/COPYING.GPLv2;md5=8ca43cbc842c2336e835926c2166c28b \
- file://Documentation/licenses/COPYING.LGPLv2.1;md5=bbb461211a33b134d42ed5ee802b37ff \
+ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://Documentation/licenses/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://Documentation/licenses/COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \
file://Documentation/licenses/COPYING.BSD-3;md5=58dcd8452651fc8b07d1f65ce07ca8af \
file://Documentation/licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
- file://getopt/COPYING;md5=c3a41733416fb80af7ba1b7e1f712551"
+ file://libuuid/COPYING;md5=aa3ac5b4a5bcb707f714f78794011b80 \
+ file://libmount/COPYING;md5=152f98bc301a5ea649769ede7203ac82 \
+ file://libblkid/COPYING;md5=152f98bc301a5ea649769ede7203ac82"
inherit autotools gettext pkgconfig
DEPENDS = "zlib ncurses"
@@ -21,7 +23,6 @@ DEPENDS_append_class-native = " lzo-native"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \
file://MCONFIG \
- file://swapargs.h \
file://defines.h \
file://make_include \
"
@@ -36,12 +37,15 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
--disable-makeinstall-chown --enable-elvtune --enable-init \
--enable-kill --enable-last --enable-mesg --enable-partx \
- --enable-raw --enable-rdev --enable-reset --disable-login-utils \
+ --enable-raw --enable-rdev --enable-reset --disable-login \
+ --disable-vipw --disable-newgrp --disable-chfn-chsh --disable-su \
--enable-write --enable-arch --enable-mount --with-fsprobe=builtin \
--enable-libuuid --enable-libblkid --enable-fsck --without-udev \
usrsbin_execdir='${sbindir}' \
"
+EXTRA_OECONF_class-native += "--disable-login --disable-su"
+
FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*"
FILES_util-linux-agetty = "${base_sbindir}/agetty"
@@ -80,7 +84,6 @@ do_compile () {
set -e
install ${WORKDIR}/MCONFIG ${S}/MCONFIG
install ${WORKDIR}/make_include ${S}/make_include
- install ${WORKDIR}/swapargs.h ${S}/mount/swapargs.h
install ${WORKDIR}/defines.h ${S}/defines.h
oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'
}
@@ -97,7 +100,7 @@ do_install () {
sbinprogs="agetty ctrlaltdel cfdisk vipw vigr"
sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon fdisk readprofile fsck blkid blockdev"
- usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall setsid chrt flock"
+ usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock"
binprogs_a="dmesg kill more umount mount login reset"
if [ "${base_sbindir}" != "${sbindir}" ]; then
@@ -133,7 +136,7 @@ ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_${PN} = "dmesg kill more reset mkswap blockdev pivot_root"
ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall"
-ALTERNATIVE_${PN} += "setsid chrt flock hwclock"
+ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump"
ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
diff --git a/meta/recipes-core/util-linux/util-linux/add-aarch64-support.patch b/meta/recipes-core/util-linux/util-linux/add-aarch64-support.patch
deleted file mode 100644
index 4480f13..0000000
--- a/meta/recipes-core/util-linux/util-linux/add-aarch64-support.patch
+++ /dev/null
@@ -1,18 +0,0 @@
----
- fdisk/fdiskbsdlabel.h | 1 +
- 1 file changed, 1 insertion(+)
-
---- util-linux-2.21.2.orig/fdisk/fdiskbsdlabel.h
-+++ util-linux-2.21.2/fdisk/fdiskbsdlabel.h
-@@ -46,10 +46,11 @@
-
- #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
-
- #if defined (__i386__) || defined (__sparc__) || defined (__arm__) || \
- defined (__mips__) || defined (__s390__) || defined (__sh__) || \
-+ defined (__aarch64__) || \
- defined(__x86_64__) || defined (__avr32__) || defined(__cris__)
- #define BSD_LABELSECTOR 1
- #define BSD_LABELOFFSET 0
- #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__)
- #define BSD_LABELSECTOR 0
diff --git a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
index f1f5ef4..a5b1ff1 100644
--- a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
+++ b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
@@ -1,18 +1,23 @@
util-linux: take ${sbindir} from the environment if it is set there
+fix the test, the [ ] syntax was getting eaten by autoconf
Signed-off-by: Phil Blundell <pb@pbcl.net>
+Signed-off-by: Saul Wold <sgw@linux.intel.com
Upstream-Status: Inappropriate [configuration]
---- util-linux-2.21.2/configure.ac~ 2012-09-22 09:29:12.354215377 +0100
-+++ util-linux-2.21.2/configure.ac 2012-09-22 16:47:14.713628946 +0100
-@@ -67,7 +67,9 @@
+Index: util-linux-2.22.1/configure.ac
+===================================================================
+--- util-linux-2.22.1.orig/configure.ac
++++ util-linux-2.22.1/configure.ac
+@@ -73,7 +73,10 @@ AC_SUBST([localstatedir])
usrbin_execdir='${exec_prefix}/bin'
AC_SUBST([usrbin_execdir])
-usrsbin_execdir='${exec_prefix}/sbin'
-+if [ -z "$usrsbin_execdir" ]; then
++if test -z "$usrsbin_execdir" ;
++then
+ usrsbin_execdir='${exec_prefix}/sbin'
+fi
AC_SUBST([usrsbin_execdir])
- usrlib_execdir='${exec_prefix}/'$libdirname
+ case $libdir in
diff --git a/meta/recipes-core/util-linux/util-linux/fix-configure.patch b/meta/recipes-core/util-linux/util-linux/fix-configure.patch
new file mode 100644
index 0000000..0ea2318
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux/fix-configure.patch
@@ -0,0 +1,20 @@
+The userlib_execdir was not getting set correctly, the quoting
+was wrong as these quoted items were not getting expanded correctly.
+
+Upstream-Status: Pending
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: util-linux-2.22.1/configure.ac
+===================================================================
+--- util-linux-2.22.1.orig/configure.ac
++++ util-linux-2.22.1/configure.ac
+@@ -79,7 +79,7 @@ fi
+ AC_SUBST([usrsbin_execdir])
+
+ case $libdir in
+- '${exec_prefix}/'* | '${prefix}/'* | /usr/*)
++ ${exec_prefix}/* | ${prefix}/* | /usr/*)
+ usrlib_execdir=$libdir ;;
+ *)
+ usrlib_execdir='${exec_prefix}'$libdir ;;
diff --git a/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch b/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
index 45826b1..5b743cb 100644
--- a/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
+++ b/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
@@ -16,16 +16,16 @@ make[3]: *** [cache.lo] Error 1
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
-Index: util-linux-2.19.1/configure.ac
+Index: util-linux-2.22.1/configure.ac
===================================================================
---- util-linux-2.19.1.orig/configure.ac
-+++ util-linux-2.19.1/configure.ac
-@@ -250,7 +250,7 @@ esac
+--- util-linux-2.22.1.orig/configure.ac
++++ util-linux-2.22.1/configure.ac
+@@ -372,7 +372,7 @@ esac
AC_MSG_CHECKING(whether program_invocation_short_name is defined)
-AC_TRY_COMPILE([#include <argp.h>],
+AC_TRY_COMPILE([#include <errno.h>],
- [program_invocation_short_name = "test";],
- AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1,
- [Define if program_invocation_short_name is defined])
+ [program_invocation_short_name = "test";],
+ AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1,
+ [Define if program_invocation_short_name is defined])
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch b/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
index ef56048..f131b76 100644
--- a/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
+++ b/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
@@ -1,10 +1,10 @@
Upstream-Status: Pending
-Index: util-linux-2.21/login-utils/login.c
+Index: util-linux-2.22.1/login-utils/login.c
===================================================================
---- util-linux-2.21.orig/login-utils/login.c
-+++ util-linux-2.21/login-utils/login.c
-@@ -1216,6 +1216,8 @@ int main(int argc, char **argv)
+--- util-linux-2.22.1.orig/login-utils/login.c
++++ util-linux-2.22.1/login-utils/login.c
+@@ -1239,6 +1239,8 @@ int main(int argc, char **argv)
char *buff;
int childArgc = 0;
int retcode;
@@ -13,14 +13,15 @@ Index: util-linux-2.21/login-utils/login.c
char *pwdbuf = NULL;
struct passwd *pwd = NULL, _pwd;
-@@ -1229,7 +1231,9 @@ int main(int argc, char **argv)
- timeout = getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT);
+@@ -1252,7 +1254,10 @@ int main(int argc, char **argv)
+ timeout = (unsigned int)getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT);
signal(SIGALRM, timedout);
- siginterrupt(SIGALRM, 1); /* we have to interrupt syscalls like ioclt() */
+ (void) sigaction(SIGALRM, NULL, &act);
+ act.sa_flags &= ~SA_RESTART;
+ sigaction(SIGALRM, &act, NULL);
- alarm((unsigned int)timeout);
++
+ alarm(timeout);
signal(SIGQUIT, SIG_IGN);
signal(SIGINT, SIG_IGN);
diff --git a/meta/recipes-core/util-linux/util-linux_2.21.2.bb b/meta/recipes-core/util-linux/util-linux_2.22.1.bb
similarity index 85%
rename from meta/recipes-core/util-linux/util-linux_2.21.2.bb
rename to meta/recipes-core/util-linux/util-linux_2.22.1.bb
index 24bed27..c72634d 100644
--- a/meta/recipes-core/util-linux/util-linux_2.21.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.22.1.bb
@@ -1,5 +1,5 @@
-MAJOR_VERSION = "2.21"
-PR = "r6"
+MAJOR_VERSION = "2.22"
+PR = "r0"
require util-linux.inc
# note that `lscpu' is under GPLv3+
@@ -9,11 +9,11 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
file://util-linux-ng-2.16-mount_lock_path.patch \
file://uclibc-__progname-conflict.patch \
file://configure-sbindir.patch \
- file://add-aarch64-support.patch \
+ file://fix-configure.patch \
"
-SRC_URI[md5sum] = "b75b3cfecb943f74338382fde693c2c3"
-SRC_URI[sha256sum] = "066f9d8e51bfabd809d266edcd54eefba1cdca57725b95c074fd47fe6fba3d30"
+SRC_URI[md5sum] = "cad23c41a014af766d467b86628bd0fd"
+SRC_URI[sha256sum] = "4297ea2a560f8839d7b3cde72a5955d1458dbad38fe0e3d99ccb1fde3df751b2"
# Only lscpu part is gplv3; rest of the code is not,
# so take out the lscpu parts while running non-gplv3 build.
--
1.8.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 4/4] build-appliance-image: Allow SRCREV to be overriden
2012-11-30 0:00 [PATCH 0/4] cmake and util-linux updates Saul Wold
` (2 preceding siblings ...)
2012-11-30 0:00 ` [PATCH 3/4] util-linux: Update to 2.22.1 Saul Wold
@ 2012-11-30 0:00 ` Saul Wold
3 siblings, 0 replies; 5+ messages in thread
From: Saul Wold @ 2012-11-30 0:00 UTC (permalink / raw)
To: openembedded-core
This will allow use to automagically set the SRCREV for builds on the
autobuilder. It will still require manual updating for releases.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/images/build-appliance-image.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/images/build-appliance-image.bb b/meta/recipes-core/images/build-appliance-image.bb
index b89354e..a8b787c 100644
--- a/meta/recipes-core/images/build-appliance-image.bb
+++ b/meta/recipes-core/images/build-appliance-image.bb
@@ -21,7 +21,7 @@ IMAGE_FSTYPES = "vmdk"
inherit core-image
-SRCREV = "a0cf759537260f00311450e0dac41bf45b474454"
+SRCREV ?= "a0cf759537260f00311450e0dac41bf45b474454"
SRC_URI = "git://git.yoctoproject.org/poky;protocol=git \
file://Yocto_Build_Appliance.vmx \
file://Yocto_Build_Appliance.vmxf \
--
1.8.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-11-30 0:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-30 0:00 [PATCH 0/4] cmake and util-linux updates Saul Wold
2012-11-30 0:00 ` [PATCH 1/4] cmake: Update to 2.8.10.1 Saul Wold
2012-11-30 0:00 ` [PATCH 2/4] sysvinit: Update ALTERNATIVES List for utmpdump Saul Wold
2012-11-30 0:00 ` [PATCH 3/4] util-linux: Update to 2.22.1 Saul Wold
2012-11-30 0:00 ` [PATCH 4/4] build-appliance-image: Allow SRCREV to be overriden Saul Wold
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.