[OE-core] [PATCH] libparted: make sure not to treat percentages as exact
--- ...ke-sure-not-to-treat-percentages-as-exact.patch | 22 meta/recipes-extended/parted/parted_3.1.bb |3 ++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/parted/parted-3.1/parted-libparted-make-sure-not-to-treat-percentages-as-exact.patch diff --git a/meta/recipes-extended/parted/parted-3.1/parted-libparted-make-sure-not-to-treat-percentages-as-exact.patch b/meta/recipes-extended/parted/parted-3.1/parted-libparted-make-sure-not-to-treat-percentages-as-exact.patch new file mode 100644 index 000..1cf8309 --- /dev/null +++ b/meta/recipes-extended/parted/parted-3.1/parted-libparted-make-sure-not-to-treat-percentages-as-exact.patch @@ -0,0 +1,22 @@ +libparted: make sure not to treat percentages as exact + +If 1% of the drive size worked out ot be an even power of +two, it would trigger the exact placement. Add an exception +for the percent units. +--- + libparted/unit.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libparted/unit.c b/libparted/unit.c +index e545985..ff479f1 100644 +--- a/libparted/unit.c b/libparted/unit.c +@@ -548,7 +548,7 @@ ped_unit_parse_custom (const char* str, const PedDevice* dev, PedUnit unit, + do not use 4MiB as the range. Rather, presume that they + are specifying precisely the starting or ending number, + and treat 4MiB just as we would treat 4194304B. */ +- if (is_power_of_2 (unit_size)) ++ if (is_power_of_2 (unit_size) unit != PED_UNIT_PERCENT) + radius = 0; + + *sector = num * unit_size / dev-sector_size; diff --git a/meta/recipes-extended/parted/parted_3.1.bb b/meta/recipes-extended/parted/parted_3.1.bb index 8344ea8..d791275 100644 --- a/meta/recipes-extended/parted/parted_3.1.bb +++ b/meta/recipes-extended/parted/parted_3.1.bb @@ -4,7 +4,7 @@ LICENSE = GPLv3+ LIC_FILES_CHKSUM = file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c SECTION = console/tools DEPENDS = ncurses readline util-linux -PR = r1 +PR = r2 SRC_URI = ${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ file://no_check.patch \ @@ -15,6 +15,7 @@ SRC_URI = ${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ file://fix-deprecated-readline.patch \ file://run-ptest \ file://Makefile \ + file://parted-libparted-make-sure-not-to-treat-percentages-as-exact.patch \ SRC_URI[md5sum] = 5d89d64d94bcfefa9ce8f59f4b81bdcb -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] nmap: use native python and add python dependence
--- recipes-security/nmap/nmap_6.25.bb |9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/recipes-security/nmap/nmap_6.25.bb b/recipes-security/nmap/nmap_6.25.bb index aff5c63..8d7e853 100644 --- a/recipes-security/nmap/nmap_6.25.bb +++ b/recipes-security/nmap/nmap_6.25.bb @@ -11,12 +11,17 @@ SRC_URI = http://nmap.org/dist/${PN}-${PV}.tar.bz2 \ SRC_URI[md5sum] = fcc80f94ff3adcb11eedf91092ea6f5e SRC_URI[sha256sum] = 3349cc6d36b86b95ca2b8075d16615a3a598cef494920d6652f9a8bf9f7660b5 -inherit autotools +inherit autotools pythonnative -DEPENDS = libpcap +DEPENDS = libpcap python EXTRA_OECONF = --without-liblua --without-zenmap --without-subversion --with-pcap=linux +export BUILD_SYS +export HOST_SYS +export STAGING_LIBDIR +export STAGING_INCDIR + do_configure() { autoconf oe_runconf -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] pseudo-1.5.1: keep install command directory mode
From: yanjun.zhu yanjun@windriver.com CQID:LIN5-17788 when install command sets the created directory mode, pseudo will change the mode of the directory to 0700 incorrectly. Signed-off-by: yanjun.zhu yanjun@windriver.com --- .../pseudo-1.5.1-install-directory-mode.patch | 10 ++ meta/recipes-devtools/pseudo/pseudo_1.5.1.bb |3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/pseudo/files/pseudo-1.5.1-install-directory-mode.patch diff --git a/meta/recipes-devtools/pseudo/files/pseudo-1.5.1-install-directory-mode.patch b/meta/recipes-devtools/pseudo/files/pseudo-1.5.1-install-directory-mode.patch new file mode 100644 index 000..02e3da2 --- /dev/null +++ b/meta/recipes-devtools/pseudo/files/pseudo-1.5.1-install-directory-mode.patch @@ -0,0 +1,10 @@ +--- a/ports/unix/guts/mkdirat.c b/ports/unix/guts/mkdirat.c +@@ -25,6 +25,7 @@ + stat_rc = base_fstatat(dirfd, path, buf, AT_SYMLINK_NOFOLLOW); + #endif + if (stat_rc != -1) { ++ buf.st_mode = PSEUDO_DB_MODE(buf.st_mode, mode); + pseudo_client_op(OP_MKDIR, 0, -1, dirfd, path, buf); + } else { + pseudo_debug(1, mkdir of %s succeeded, but stat failed: %s\n, diff --git a/meta/recipes-devtools/pseudo/pseudo_1.5.1.bb b/meta/recipes-devtools/pseudo/pseudo_1.5.1.bb index bc92856..64115ca 100644 --- a/meta/recipes-devtools/pseudo/pseudo_1.5.1.bb +++ b/meta/recipes-devtools/pseudo/pseudo_1.5.1.bb @@ -1,11 +1,12 @@ require pseudo.inc -PR = r4 +PR = r5 SRC_URI = \ http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0001-pseudo_has_unload-add-function.patch \ file://shutdownping.patch \ +file://pseudo-1.5.1-install-directory-mode.patch \ SRC_URI[md5sum] = 5ec67c7bff5fe68c56de500859c19172 -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] boot-directdisk: add the support of vmdk
--- meta/classes/boot-directdisk.bbclass | 24 +++- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass index 5535728..b2bd210 100644 --- a/meta/classes/boot-directdisk.bbclass +++ b/meta/classes/boot-directdisk.bbclass @@ -88,6 +88,15 @@ build_boot_dd() { grubefi_hddimg_populate $HDDDIR fi + if [ ${IMAGE_FSTYPE} = vmdk ]; then + if [ x${AUTO_SYSLINUXMENU} = x1 ] ; then + install -m 0644 ${STAGING_DIR}/${MACHINE}/usr/share/syslinux/vesamenu.c32 ${HDDDIR}${SYSLINUXDIR}/vesamenu.c32 + if [ x${SYSLINUX_SPLASH} != x ] ; then + install -m 0644 ${SYSLINUX_SPLASH} ${HDDDIR}${SYSLINUXDIR}/splash.lss + fi + fi + fi + BLOCKS=`du -bks $HDDDIR | cut -f 1` BLOCKS=`expr $BLOCKS + ${BOOTDD_EXTRA_SPACE}` @@ -119,17 +128,22 @@ build_boot_dd() { parted $IMAGE mkpart primary fat16 0 ${END1}B parted $IMAGE unit B mkpart primary ext2 ${END2}B ${END3}B parted $IMAGE set 1 boot on - parted $IMAGE print + + if [ ${IMAGE_FSTYPE} != vmdk ]; then + parted $IMAGE print + fi awk BEGIN { printf \$(echo ${DISK_SIGNATURE} | fold -w 2 | tac | paste -sd '' | sed 's/\(..\)/\\x/g')\ } | \ dd of=$IMAGE bs=1 seek=440 conv=notrunc OFFSET=`expr $END2 / 512` - if [ ${PCBIOS} = 1 ]; then - dd if=${STAGING_DATADIR}/syslinux/mbr.bin of=$IMAGE conv=notrunc + if [ ${IMAGE_FSTYPE} != vmdk ]; then + if [ ${PCBIOS} = 1 ]; then + dd if=${STAGING_DATADIR}/syslinux/mbr.bin of=$IMAGE conv=notrunc + fi + dd if=$HDDIMG of=$IMAGE conv=notrunc seek=1 bs=512 fi - dd if=$HDDIMG of=$IMAGE conv=notrunc seek=1 bs=512 - dd if=${ROOTFS} of=$IMAGE conv=notrunc seek=$OFFSET bs=512 + dd if=${ROOTFS} of=$IMAGE conv=notrunc seek=$OFFSET bs=512 cd ${DEPLOY_DIR_IMAGE} rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdddirect -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core