assorted independent pathlets
PATCH 4/9 micro: get preferred binutils from sane-toolchain
In reply to Bernhard Reutner-Fischer--- conf/distro/micro.conf | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
conf/distro/micro.conf +0 -1
@@ -61,7 +61,6 @@ MACHINE_KERNEL_VERSION = "2.6" # TOOLCHAIN ############################################################################# LIBC ?= "eglibc" -PREFERRED_BINUTILS ?= "2.20.1" PREFERRED_VERSION_glibc ?= "2.10.1" PREFERRED_VERSION_glibc-initial ?= "2.10.1" PREFERRED_ARM_INSTRUCTION_SET ?= "thumb"
Signature · 1 line
1.7.2.3
PATCH 7/9 kernel.bbclass: simplify "if image" condition
In reply to Bernhard Reutner-FischerAnything that expands image to any false value should not set INITRAMFS_TASK (instead of just "" or None).
--- classes/kernel.bbclass | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
classes/kernel.bbclass +1 -1
@@ -18,7 +18,7 @@ python __anonymous () { bb.data.setVar("DEPENDS", depends, d) image = bb.data.getVar('INITRAMFS_IMAGE', d, True) - if image != '' and image is not None: + if image: bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d) machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True)
Signature · 1 line
1.7.2.3
PATCH 1/9 fakeroot: add 1.14.5, mv 1.12.4 to obsolete
In reply to Bernhard Reutner-FischerThe other old recipes should be removed.
- oplinux suggests 1.7.1 which is not available anymore
- chinook-compat, maemo5-compat pin 1.9.6
--- recipes/fakeroot/fakeroot-1.14.5/fix-prefix.patch | 15 +++++++++++ .../fakeroot-1.14.5/quiet-getopt-check.patch | 12 +++++++++ recipes/fakeroot/fakeroot-native_1.12.4.bb | 21 ---------------- recipes/fakeroot/fakeroot.inc | 16 ++++++++++++ recipes/fakeroot/fakeroot_1.12.4.bb | 26 -------------------- recipes/fakeroot/fakeroot_1.14.5.bb | 10 +++++++ .../obsolete/fakeroot/fakeroot-native_1.12.4.bb | 21 ++++++++++++++++ recipes/obsolete/fakeroot/fakeroot_1.12.4.bb | 26 ++++++++++++++++++++ 8 files changed, 100 insertions(+), 47 deletions(-) create mode 100644 recipes/fakeroot/fakeroot-1.14.5/fix-prefix.patch create mode 100644 recipes/fakeroot/fakeroot-1.14.5/quiet-getopt-check.patch delete mode 100644 recipes/fakeroot/fakeroot-native_1.12.4.bb create mode 100644 recipes/fakeroot/fakeroot.inc delete mode 100644 recipes/fakeroot/fakeroot_1.12.4.bb create mode 100644 recipes/fakeroot/fakeroot_1.14.5.bb create mode 100644 recipes/obsolete/fakeroot/fakeroot-native_1.12.4.bb create mode 100644 recipes/obsolete/fakeroot/fakeroot_1.12.4.bb
recipes/fakeroot/fakeroot-1.14.5/fix-prefix.patch new file +15 -0
@@ -0,0 +1,15 @@ +This is not needed, kept just for reference. + +--- fakeroot-1.14.5.orig/scripts/fakeroot.in 2009-11-15 04:09:21.000000000 +0100 ++++ fakeroot-1.14.5/scripts/fakeroot.in 2011-01-12 20:10:02.897300394 +0100 +@@ -30,8 +30,8 @@ fatal () + } + + # strip /bin/fakeroot to find install prefix +-FAKEROOT_PREFIX=@prefix@ +-FAKEROOT_BINDIR=@bindir@ ++FAKEROOT_BINDIR=`dirname $0` ++FAKEROOT_PREFIX=`dirname ${FAKEROOT_BINDIR}` + + USEABSLIBPATH=@LDPRELOADABS@ + LIB=lib@fakeroot_transformed@@DLSUFFIX@
recipes/fakeroot/fakeroot-1.14.5/quiet-getopt-check.patch new file +12 -0
@@ -0,0 +1,12 @@ +busybox provided getopt prints the help-text on stderr. +--- fakeroot-1.14.5.orig/scripts/fakeroot.in 2009-11-15 04:09:21.000000000 +0100 ++++ fakeroot-1.14.5/scripts/fakeroot.in 2011-01-12 20:11:50.059891996 +0100 +@@ -43,7 +43,7 @@ export FAKED_MODE + + libfound=no + +-GETOPTEST=`getopt --version` ++GETOPTEST=`getopt --version 2> /dev/null` + case $GETOPTEST in + getopt*) # GNU getopt + FAKE_TEMP=`getopt -l lib: -l faked: -l unknown-is-real -l fd-base: -l version -l help -- +l:f:i:s:ub:vh "$@"`
recipes/fakeroot/fakeroot-native_1.12.4.bb deleted +0 -21
@@ -1,21 +0,0 @@ -require fakeroot_${PV}.bb - -SRC_URI += "file://fix-prefix.patch" -S = "${WORKDIR}/fakeroot-${PV}" - -inherit native - -EXTRA_OECONF = "--program-prefix=" - -# Compatability for the rare systems not using or having SYSV -python () { - if bb.data.getVar('HOST_NONSYSV', d, True) and bb.data.getVar('HOST_NONSYSV', d, True) != '0': - bb.data.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ', d) -} - -NATIVE_INSTALL_WORKS = "1" - -RDEPENDS_${PN} = "util-linux-native" - -SRC_URI[md5sum] = "aaefede2405a40c87438e7e833d69b70" -SRC_URI[sha256sum] = "dbcab1f495b857e67feff882e018ca59958b8d189ff1f76684d28e35463ec29d"
recipes/fakeroot/fakeroot.inc new file +16 -0
@@ -0,0 +1,16 @@ +DESCRIPTION = "Gives a fake root environment" +HOMEPAGE = "http://fakeroot.alioth.debian.org" +SECTION = "base" +LICENSE = "GPL" +INC_PR = "r0" +inherit autotools +BBCLASSEXTEND = "native" + +SRC_URI = "\ + file://configure-libtool.patch \ +" +# previous versions did the following for -native, but why? Not needed.. +#SRC_URI_append_virtclass-native = "file://fix-prefix.patch" + +# fakeroot needs getopt which is provided by the util-linux package +RDEPENDS_${PN} = "util-linux"
recipes/fakeroot/fakeroot_1.12.4.bb deleted +0 -26
@@ -1,26 +0,0 @@ -DESCRIPTION = "Gives a fake root environment" -HOMEPAGE = "http://fakeroot.alioth.debian.org" -SECTION = "base" -LICENSE = "GPL" -PR = "r2" - -SRC_URI = "\ - ${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \ - file://configure-libtool.patch \ -" - -inherit autotools - -do_install_append() { - install -d ${D}${includedir}/fakeroot - install -m 644 *.h ${D}${includedir}/fakeroot - install -d ${D}${libdir}/libfakeroot/ - oe_libinstall -so libfakeroot ${D}${libdir}/libfakeroot/ -} - -# fakeroot needs getopt which is provided by the util-linux package -RDEPENDS_${PN} = "util-linux" - - -SRC_URI[md5sum] = "aaefede2405a40c87438e7e833d69b70" -SRC_URI[sha256sum] = "dbcab1f495b857e67feff882e018ca59958b8d189ff1f76684d28e35463ec29d"
recipes/fakeroot/fakeroot_1.14.5.bb new file +10 -0
@@ -0,0 +1,10 @@ +require fakeroot.inc +PR = "${INC_PR}.0" + +SRC_URI =+ "\ + ${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.orig.tar.bz2 \ + file://quiet-getopt-check.patch \ +" + +SRC_URI[md5sum] = "659a1f3a36554abfc2a3eaad2fdc0604" +SRC_URI[sha256] = "b035c834944bf9482027f48c388de8492e96609825265ac03f05408d0b3aae68"
recipes/obsolete/fakeroot/fakeroot-native_1.12.4.bb new file +21 -0
@@ -0,0 +1,21 @@ +require fakeroot_${PV}.bb + +SRC_URI += "file://fix-prefix.patch" +S = "${WORKDIR}/fakeroot-${PV}" + +inherit native + +EXTRA_OECONF = "--program-prefix=" + +# Compatability for the rare systems not using or having SYSV +python () { + if bb.data.getVar('HOST_NONSYSV', d, True) and bb.data.getVar('HOST_NONSYSV', d, True) != '0': + bb.data.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ', d) +} + +NATIVE_INSTALL_WORKS = "1" + +RDEPENDS_${PN} = "util-linux-native" + +SRC_URI[md5sum] = "aaefede2405a40c87438e7e833d69b70" +SRC_URI[sha256sum] = "dbcab1f495b857e67feff882e018ca59958b8d189ff1f76684d28e35463ec29d"
recipes/obsolete/fakeroot/fakeroot_1.12.4.bb new file +26 -0
@@ -0,0 +1,26 @@ +DESCRIPTION = "Gives a fake root environment" +HOMEPAGE = "http://fakeroot.alioth.debian.org" +SECTION = "base" +LICENSE = "GPL" +PR = "r2" + +SRC_URI = "\ + ${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \ + file://configure-libtool.patch \ +" + +inherit autotools + +do_install_append() { + install -d ${D}${includedir}/fakeroot + install -m 644 *.h ${D}${includedir}/fakeroot + install -d ${D}${libdir}/libfakeroot/ + oe_libinstall -so libfakeroot ${D}${libdir}/libfakeroot/ +} + +# fakeroot needs getopt which is provided by the util-linux package +RDEPENDS_${PN} = "util-linux" + + +SRC_URI[md5sum] = "aaefede2405a40c87438e7e833d69b70" +SRC_URI[sha256sum] = "dbcab1f495b857e67feff882e018ca59958b8d189ff1f76684d28e35463ec29d"
Signature · 1 line
1.7.2.3
PATCH 3/9 IMAGE_CMD_ext4.xz: rm uncompressed image
In reply to Bernhard Reutner-Fischer--- conf/bitbake.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
conf/bitbake.conf +1 -1
@@ -387,7 +387,7 @@ IMAGE_CMD_ext3.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 IMAGE_CMD_ext4 = "genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac;" IMAGE_CMD_ext4.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; set +e;e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz" IMAGE_CMD_ext4.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.bz2" -IMAGE_CMD_ext4.xz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.xz; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; xz -c ${XZ_COMPRESSION_LEVEL} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.xz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.xz" +IMAGE_CMD_ext4.xz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.xz; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; xz -c ${XZ_COMPRESSION_LEVEL} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.xz ; rm -f ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ; rmdir ${DEPLOY_DIR_IMAGE}/tmp.xz" IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -comp lzma"
Signature · 1 line
1.7.2.3
PATCH 6/9 uclibc: handle some more {machine, distro}_features
In reply to Bernhard Reutner-Fischerdistro: xattr (posix extended attributes), ssp
machine: kernel24
--- recipes/uclibc/uclibc-config.inc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
recipes/uclibc/uclibc-config.inc +4 -1
@@ -95,12 +95,15 @@ def uclibc_cfg(feature, features, tokens, cnf, rem): def features_to_uclibc_settings(d): cnf, rem = ([], []) distro_features = bb.data.getVar('DISTRO_FEATURES', d, True).split() - #machine_features = bb.data.getVar('MACHINE_FEATURES', d, True).split() + machine_features = bb.data.getVar('MACHINE_FEATURES', d, True).split() uclibc_cfg('ipv4', distro_features, 'UCLIBC_HAS_IPV4', cnf, rem) uclibc_cfg('ipv6', distro_features, 'UCLIBC_HAS_IPV6', cnf, rem) uclibc_cfg('largefile', distro_features, 'UCLIBC_HAS_LFS', cnf, rem) uclibc_cfg('nls', distro_features, 'UCLIBC_HAS_LOCALE', cnf, rem) uclibc_cfg('thumb-interwork', distro_features,'USE_BX', cnf, rem) + uclibc_cfg('xattr', distro_features, 'UCLIBC_HAS_XATTR', cnf, rem) + uclibc_cfg('ssp', distro_features, 'UCLIBC_HAS_SSP', cnf, rem) + uclibc_cfg('kernel24', machine_features,'UCLIBC_LINUX_MODULE_24', cnf, rem) return "\n".join(cnf), "\n".join(rem) # X, Y = ${@features_to_uclibc_settings(d)} # unfortunately doesn't seem to work with bitbake, workaround:
Signature · 1 line
1.7.2.3
PATCH 2/9 packaged-staging.bbclass: improve documentation
In reply to Bernhard Reutner-FischerMention usage of PSTAGE_MIRROR and add debugging-output for fetching.
--- classes/packaged-staging.bbclass | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-)
classes/packaged-staging.bbclass +10 -2
@@ -6,6 +6,10 @@ # # INHERIT += "packaged-staging" # +# To use the prebuilt pstage packages, save them away.. +# $ rsync --delete -a tmp/pstage/ /there/oe/build/pstage_mirror +# .. and use it as mirror in your conf/local.conf: +# PSTAGE_MIRROR = "file:///there/oe/build/pstage_mirror" #
@@ -190,16 +194,20 @@ def staging_fetch(stagepkg, d): pd = d.createCopy() dldir = bb.data.expand("${PSTAGE_DIR}/${PSTAGE_PKGPATH}", pd) mirror = bb.data.expand("${PSTAGE_MIRROR}/${PSTAGE_PKGPATH}/", pd) - srcuri = mirror + os.path.basename(stagepkg) + bn = os.path.basename(stagepkg) + srcuri = mirror + bn bb.data.setVar('DL_DIR', dldir, pd) bb.data.setVar('SRC_URI', srcuri, pd) # Try a fetch from the pstage mirror, if it fails just return and # we will build the package + bb.debug(1, "Attempting to fetch staging package %s" % (bn)) try: bb.fetch.init([srcuri], pd) bb.fetch.go(pd, [srcuri]) - except: + bb.debug(1, "Fetched staging package %s" % (bn)) + except Exception as ex: + bb.debug(1, "Failed to fetch staging package %s: %s" % (bn, ex)) return PSTAGE_TASKS_COVERED = "fetch unpack munge patch configure qa_configure rig_locales compile sizecheck install deploy package populate_sysroot package_write_deb package_write_ipk package_write package_stage qa_staging"
Signature · 1 line
1.7.2.3
PATCH 9/9 util-linux: honour largefile distro feature
In reply to Bernhard Reutner-Fischerdo_install on micro-image still broken (${bindir}/hexdump lives in ${usrbindir}/hexdump from util-linux POV. Not fixing these.)
--- recipes/util-linux/files/MCONFIG | 1 - recipes/util-linux/util-linux.inc | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-)
recipes/util-linux/files/MCONFIG +0 -1
@@ -206,7 +206,6 @@ endif CFLAGS := $(OPT) -I$(LIB) $(WARNFLAGS) \ $(CURSESFLAGS) $(SLANGFLAGS) $(NLSFLAGS) \ - -D_FILE_OFFSET_BITS=64 \ -DSBINDIR=\"$(SBIN_DIR)\" \ -DUSRSBINDIR=\"$(USRSBIN_DIR)\" \ -DLOGDIR=\"$(LOG_DIR)\" \
recipes/util-linux/util-linux.inc +3 -1
@@ -2,7 +2,7 @@ DESCRIPTION = "Util-linux is a suite of essential utilities for any Linux system SECTION = "base" LICENSE = "GPL" DEPENDS = "zlib ncurses" -INC_PR = "r16" +INC_PR = "r17" inherit autotools SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux/util-linux-${PV}.tar.bz2 \
@@ -30,6 +30,8 @@ FILES_util-linux-readprofile = "/usr/sbin/readprofile" RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile " RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup" +CFLAGS_append = "${@base_contains('DISTRO_FEATURES', 'largefile', '-D_FILE_OFFSET_BITS=64', '', d)}" + do_compile () { set -e install ${WORKDIR}/MCONFIG ${S}/MCONFIG
Signature · 1 line
1.7.2.3
cover assorted independent pathlets
Hi,
Some independent patchlets. Ok for master?
Bernhard Reutner-Fischer (9):
fakeroot: add 1.14.5, mv 1.12.4 to obsolete packaged-staging.bbclass: improve documentation IMAGE_CMD_ext4.xz: rm uncompressed image
micro: get preferred binutils from sane-toolchain
ltp: bump version
uclibc: handle some more {machine,distro}_features kernel.bbclass: simplify "if image" condition image.bbclass: only insert feed uris if ONLINE_PACKAGE_MANAGEMENT
util-linux: honour largefile distro feature
classes/image.bbclass | 3 +- classes/kernel.bbclass | 2 +- classes/packaged-staging.bbclass | 12 +- conf/bitbake.conf | 2 +- conf/distro/micro.conf | 1 - recipes/fakeroot/fakeroot-1.14.5/fix-prefix.patch | 15 + .../fakeroot-1.14.5/quiet-getopt-check.patch | 12 + recipes/fakeroot/fakeroot-native_1.12.4.bb | 21 -- recipes/fakeroot/fakeroot.inc | 16 + recipes/fakeroot/fakeroot_1.12.4.bb | 26 -- recipes/fakeroot/fakeroot_1.14.5.bb | 10 + recipes/ltp/ltp-20100831/runalltests.patch | 302 -------------------- recipes/ltp/ltp-20101031/runalltests.patch | 302 ++++++++++++++++++++ recipes/ltp/ltp_20100831.bb | 39 --- recipes/ltp/ltp_20101031.bb | 38 +++ .../obsolete/fakeroot/fakeroot-native_1.12.4.bb | 21 ++ recipes/obsolete/fakeroot/fakeroot_1.12.4.bb | 26 ++ recipes/uclibc/uclibc-config.inc | 5 +- recipes/util-linux/files/MCONFIG | 1 - recipes/util-linux/util-linux.inc | 4 +- 20 files changed, 461 insertions(+), 397 deletions(-) create mode 100644 recipes/fakeroot/fakeroot-1.14.5/fix-prefix.patch create mode 100644 recipes/fakeroot/fakeroot-1.14.5/quiet-getopt-check.patch delete mode 100644 recipes/fakeroot/fakeroot-native_1.12.4.bb create mode 100644 recipes/fakeroot/fakeroot.inc delete mode 100644 recipes/fakeroot/fakeroot_1.12.4.bb create mode 100644 recipes/fakeroot/fakeroot_1.14.5.bb delete mode 100644 recipes/ltp/ltp-20100831/runalltests.patch create mode 100644 recipes/ltp/ltp-20101031/runalltests.patch delete mode 100644 recipes/ltp/ltp_20100831.bb create mode 100644 recipes/ltp/ltp_20101031.bb create mode 100644 recipes/obsolete/fakeroot/fakeroot-native_1.12.4.bb create mode 100644 recipes/obsolete/fakeroot/fakeroot_1.12.4.bb
Signature · 1 line
1.7.2.3
PATCH 5/9 ltp: bump version
--- recipes/ltp/ltp-20100831/runalltests.patch | 302 ---------------------------- recipes/ltp/ltp-20101031/runalltests.patch | 302 ++++++++++++++++++++++++++++ recipes/ltp/ltp_20100831.bb | 39 ---- recipes/ltp/ltp_20101031.bb | 38 ++++ 4 files changed, 340 insertions(+), 341 deletions(-) delete mode 100644 recipes/ltp/ltp-20100831/runalltests.patch create mode 100644 recipes/ltp/ltp-20101031/runalltests.patch delete mode 100644 recipes/ltp/ltp_20100831.bb create mode 100644 recipes/ltp/ltp_20101031.bb
recipes/ltp/ltp-20100831/runalltests.patch deleted +0 -302
@@ -1,302 +0,0 @@ ---- ltp-full-20100831.orig/runalltests.sh 2010-09-14 16:04:32.000000000 +0500 -+++ ltp-full-20100831/runalltests.sh 2010-12-13 11:18:11.857382107 +0500 -@@ -68,6 +68,12 @@ export RUN_FILECAPS=0 - export LIBCAPS_INSTALLED=0 - export LIBATTR_INSTALLED=0 - -+## Set this to 1 if tmp_tools tests are required to be tested -+export RUN_TPM_TOOLS=0 -+ -+## Set this to 1 if tcore tests are required to be tested -+export RUN_TCORE=0 -+ - ## Set this to 1 if you wish to execute the stress_cd tests - ## Make sure you have FLOPPY inserted, be warned that you - ## will loose all data on it after the tests, -@@ -202,6 +208,194 @@ export RUN_SMACK_SECURITY_TESTS=0 - ##Set this to 1 if you wish to run the Basic PERFORMANCE COUNTER tests - export RUN_PERFORMANCE_COUNTERS_TESTS=0 - -+### Additional tests That are not included in runalltests.sh -+export RUN_LTP_AIODIO_PART1=0 -+export RUN_LTP_AIODIO_PART2=0 -+export RUN_LTP_AIODIO_PART3=0 -+export RUN_LTP_AIODIO_PART4=0 -+ -+if [ $RUN_LTP_AIODIO_PART1 -eq 1 ] -+then -+ AIODIO_PART1_STR="ltp-aiodio.part1" -+fi -+ -+if [ $RUN_LTP_AIODIO_PART2 -eq 1 ] -+then -+ AIODIO_PART2_STR="ltp-aiodio.part2" -+fi -+ -+if [ $RUN_LTP_AIODIO_PART3 -eq 1 ] -+then -+ AIODIO_PART3_STR="ltp-aiodio.part3" -+fi -+ -+if [ $RUN_LTP_AIODIO_PART4 -eq 1 ] -+then -+ AIODIO_PART4_STR="ltp-aiodio.part4" -+fi -+ -+## This is default set of tests chose which tests you want to perform by default -+## Set this to 1 if you wish to run the specific tests -+ -+export RUN_DEFAULT_MATH=0 -+export RUN_DEFAULT_NPTL=0 -+export RUN_DEFAULT_PTY=0 -+export RUN_DEFAULT_IO=0 -+export RUN_DEFAULT_TIMERS=0 -+export RUN_DEFAULT_MM=0 -+export RUN_DEFAULT_IPC=0 -+export RUN_DEFAULT_SCHED=0 -+export RUN_DEFAULT_CONTAINERS=0 -+export RUN_DEFAULT_CONNECTORS=0 -+export RUN_DEFAULT_FILECAPS=0 -+export RUN_DEFAULT_CAP_BOUNDS=0 -+export RUN_DEFAULT_FSX=0 -+export RUN_DEFAULT_FCNTL_LOCKTESTS=0 -+export RUN_DEFAULT_CONTROLLERS=0 -+export RUN_DEFAULT_ADMIN_TOOLS=0 -+export RUN_DEFAULT_HYPERTHREADING=0 -+export RUN_DEFAULT_DIO=0 -+export RUN_DEFAULT_SYSCALLS=0 -+export RUN_DEFAULT_FS_PERMS_SIMPLE=0 -+export RUN_DEFAULT_POWER_MANAGEMENT_TESTS=0 -+export RUN_DEFAULT_NUMA=0 -+export RUN_DEFAULT_HUGETLB=0 -+export RUN_DEFAULT_COMMANDS=0 -+export RUN_DEFAULT_FS=0 -+export RUN_DEFAULT_FS_BIND=0 -+ -+if [ $RUN_DEFAULT_SYSCALLS -eq 1 ] -+then -+ SYSCALLS_STR="syscalls" -+fi -+ -+if [ $RUN_DEFAULT_FS -eq 1 ] -+then -+ FS_STR="fs" -+fi -+ -+if [ $RUN_DEFAULT_FS_PERMS_SIMPLE -eq 1 ] -+then -+ FS_PERMS_SIMPLE_STR="fs_perms_simple" -+fi -+ -+if [ $RUN_DEFAULT_FSX -eq 1 ] -+then -+ FSX_STR="fsx" -+fi -+ -+if [ $RUN_DEFAULT_DIO -eq 1 ] -+then -+ DIO_STR="dio" -+fi -+ -+if [ $RUN_DEFAULT_IO -eq 1 ] -+then -+ IO_STR="io" -+fi -+ -+if [ $RUN_DEFAULT_MM -eq 1 ] -+then -+ MM_STR="mm" -+fi -+ -+if [ $RUN_DEFAULT_IPC -eq 1 ] -+then -+ IPC_STR="ipc" -+fi -+ -+if [ $RUN_DEFAULT_SCHED -eq 1 ] -+then -+ SCHED_STR="sched" -+fi -+ -+if [ $RUN_DEFAULT_MATH -eq 1 ] -+then -+ MATH_STR="math" -+fi -+ -+if [ $RUN_DEFAULT_NPTL -eq 1 ] -+then -+ NPTL_STR="nptl" -+fi -+ -+if [ $RUN_DEFAULT_PTY -eq 1 ] -+then -+ PTY_STR="pty" -+fi -+ -+if [ $RUN_DEFAULT_CONTAINERS -eq 1 ] -+then -+ CONTAINERS_STR="containers" -+fi -+ -+if [ $RUN_DEFAULT_FS_BIND -eq 1 ] -+then -+ FS_BIND_STR="fs_bind" -+fi -+ -+if [ $RUN_DEFAULT_CONTROLLERS -eq 1 ] -+then -+ CONTROLLERS_STR="controllers" -+fi -+ -+if [ $RUN_DEFAULT_FILECAPS -eq 1 ] -+then -+ FILECAPS_STR="filecaps" -+fi -+ -+if [ $RUN_DEFAULT_CAP_BOUNDS -eq 1 ] -+then -+ CAP_BOUNDS_STR="cap_bounds" -+fi -+ -+if [ $RUN_DEFAULT_FCNTL_LOCKTESTS -eq 1 ] -+then -+ FCNTL_LOCKTESTS_STR="fcntl-locktests" -+fi -+ -+if [ $RUN_DEFAULT_CONNECTORS -eq 1 ] -+then -+ CONNECTORS_STR="connectors" -+fi -+ -+if [ $RUN_DEFAULT_ADMIN_TOOLS -eq 1 ] -+then -+ ADMIN_TOOLS_STR="admin_tools" -+fi -+ -+if [ $RUN_DEFAULT_TIMERS -eq 1 ] -+then -+ TIMERS_STR="timers" -+fi -+ -+if [ $RUN_DEFAULT_POWER_MANAGEMENT_TESTS -eq 1 ] -+then -+ POWER_MANAGEMENT_TESTS_STR="power_management_tests" -+fi -+ -+if [ $RUN_DEFAULT_NUMA -eq 1 ] -+then -+ NUMA_STR="numa" -+fi -+ -+if [ $RUN_DEFAULT_HUGETLB -eq 1 ] -+then -+ HUGETLB_STR="hugetlb" -+fi -+ -+if [ $RUN_DEFAULT_COMMANDS -eq 1 ] -+then -+ COMMANDS_STR="commands" -+fi -+ -+if [ $RUN_DEFAULT_HYPERTHREADING -eq 1 ] -+then -+ HYPERTHREADING_STR="hyperthreading" -+fi -+ -+ -+ - export LTP_VERSION=`"${RUNLTP}" -e` - export TEST_START_TIME=`date +"%Y_%b_%d-%Hh_%Mm_%Ss"` - export HARDWARE_TYPE=$(uname -i) -@@ -215,13 +409,68 @@ if ! cd "${LTPROOT}"; then - exit $rc - fi - -+# ## The First one i plan to run is the default LTP run ## -+# ## START => Test Series 1 ## -+# echo "Running Default LTP..." -+# "${RUNLTP}" -g $HTML_OUTPUT_FILE_NAME -+# printf "Completed running Default LTP\n\n\n" -+# ## END => Test Series 1 ## -+ - ## The First one i plan to run is the default LTP run ## - ## START => Test Series 1 ## - echo "Running Default LTP..." --"${RUNLTP}" -g $HTML_OUTPUT_FILE_NAME -+ RUN_DEFAULT_SET="$SYSCALLS_STR \ -+ $FS_STR \ -+ $FS_PERMS_SIMPLE_STR \ -+ $FSX_STR \ -+ $DIO_STR \ -+ $IO_STR \ -+ $MM_STR \ -+ $IPC_STR \ -+ $SCHED_STR \ -+ $MATH_STR \ -+ $NPTL_STR \ -+ $PTY_STR \ -+ $CONTAINERS_STR \ -+ $FS_BIND_STR \ -+ $CONTROLLERS_STR \ -+ $FILECAPS_STR \ -+ $CAP_BOUNDS_STR \ -+ $FCNTL_LOCKTESTS_STR \ -+ $CONNECTORS_STR \ -+ $ADMIN_TOOLS_STR \ -+ $TIMERS_STR \ -+ $POWER_MANAGEMENT_TESTS_STR \ -+ $NUMA_STR \ -+ $HUGETLB_STR \ -+ $COMMANDS_STR \ -+ $HYPERTHREADING_STR \ -+ $AIODIO_PART1_STR \ -+ $AIODIO_PART2_STR \ -+ $AIODIO_PART3_STR \ -+ $AIODIO_PART4_STR" -+ -+ rm -f runtest/defaultset -+ for TEST in $RUN_DEFAULT_SET -+ do -+ UPPER=`echo $TEST | tr "[:lower:]" "[:upper:]"` -+# # var="_STR" -+# # echo " \$$UPPER$var \\" -+# # echo "Running Test $UPPER" -+ echo "Running Test $TEST" -+ cat runtest/$TEST >> runtest/defaultset -+# # echo "if [ \$RUN_DEFAULT_$UPPER -eq 1 ]" -+# # echo "then" -+# # echo " $UPPER$var=\"$TEST\"" -+# # echo "fi" -+# # echo "" -+# # echo "export RUN_DEFAULT_$UPPER=1" -+ done -+ "${RUNLTP}" -f defaultset -g defaultset.html - printf "Completed running Default LTP\n\n\n" - ## END => Test Series 1 ## - -+ - ## The next one i plan to run is ballista ## - ## START => Test Series 2 ## - if [ $RUN_BALLISTA -eq 1 ] -@@ -353,15 +602,20 @@ then - fi - ## END => Test Series 6 ## - -- - ## The next one i plan to run is tpm_tools ## - ## START => Test Series 7 ## -+if [ $RUN_TPM_TOOLS -eq 1 ] -+then - "${RUNLTP}" -f tpm_tools -+fi - ## END => Test Series 7 ## - - ## The next one i plan to run is tcore_patch_test_suites - ## START => Test Series 8 ## -+if [ $RUN_TCORE -eq 1 ] -+then - "${RUNLTP}" -f tcore -+fi - ## END => Test Series 8 ## - -
recipes/ltp/ltp-20101031/runalltests.patch new file +302 -0
302 lines not on this page · raw message
recipes/ltp/ltp_20100831.bb deleted +0 -39
@@ -1,39 +0,0 @@ -DESCRIPTION = "Linux Test Project" -HOMEPAGE = "http://ltp.sourceforge.net" -LICENSE = "GPL" -SECTION = "console/utils" -DEPENDS = "zip-native" -PR = "r0" - -inherit autotools - -SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.tgz \ - file://runalltests.patch \ - " - -S = "${WORKDIR}/ltp-full-${PV}" - -EXTRA_OEMAKE_append = " CROSS_COMPILE=${HOST_PREFIX} SKIP_IDCHECK=1" - -FILES_${PN}-dbg += "/usr/.debug" -FILES_${PN}-dbg += "/usr/bin/.debug" -FILES_${PN}-dbg += "/usr/runtest/.debug" -FILES_${PN}-dbg += "/usr/testcases/bin/.debug" -FILES_${PN}-dbg += "/usr/testcases/bin/*/bin/.debug" -FILES_${PN}-dbg += "/usr/testcases/bin/*/test/.debug" - -FILES_${PN} += "/usr/* /usr/bin/* /usr/runtest/* /usr/testcases/bin/* /usr/testcases/bin/*/bin/* /usr/runtest/* /usr/testscripts/*" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_compile(){ - oe_runmake CROSS_COMPILE=${HOST_PREFIX} -} - -do_install(){ - oe_runmake DESTDIR=${D} install -} - -SRC_URI[md5sum] = "fc5a36a7dcc8f7d5fa7b34dd4f43f25b" -SRC_URI[sha256sum] = "c0ce2599ea0daf94b6259ba8fdbdd4cf42c7a3424314974df16fcb4c4599aed2" -
recipes/ltp/ltp_20101031.bb new file +38 -0
@@ -0,0 +1,38 @@ +DESCRIPTION = "Linux Test Project" +HOMEPAGE = "http://ltp.sourceforge.net" +LICENSE = "GPL" +SECTION = "console/utils" +DEPENDS = "zip-native" +PR = "r0" + +inherit autotools + +SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 \ + file://runalltests.patch" + +S = "${WORKDIR}/ltp-full-${PV}" + +EXTRA_OEMAKE_append = " CROSS_COMPILE=${HOST_PREFIX} SKIP_IDCHECK=1" + +FILES_${PN}-dbg += "/usr/.debug" +FILES_${PN}-dbg += "/usr/bin/.debug" +FILES_${PN}-dbg += "/usr/runtest/.debug" +FILES_${PN}-dbg += "/usr/testcases/bin/.debug" +FILES_${PN}-dbg += "/usr/testcases/bin/*/bin/.debug" +FILES_${PN}-dbg += "/usr/testcases/bin/*/test/.debug" + +FILES_${PN} += "/usr/* /usr/bin/* /usr/runtest/* /usr/testcases/bin/* /usr/testcases/bin/*/bin/* /usr/runtest/* /usr/testscripts/*" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_compile(){ + oe_runmake CROSS_COMPILE=${HOST_PREFIX} +} + +do_install(){ + oe_runmake DESTDIR=${D} install +} + +SRC_URI[md5sum] = "553e13e8f2b0cd75fa93f832a8f734a7" +SRC_URI[sha256sum] = "df8c7607f8887aafc51510c04966ecb91e52135e5a86298f73fd30c148960ce8" +
Signature · 1 line
1.7.2.3
PATCH 8/9 image.bbclass: only insert feed uris if ONLINE_PACKAGE_MANAGEMENT
In reply to Bernhard Reutner-FischerPreviously if ONLINE_PACKAGE_MANAGEMENT="none" but one had FEED_DEPLOYDIR_BASE_URI set, it tried to create files in a non-existing dir in the image (there is no /etc/opkg/ if no online package management is requested).
--- classes/image.bbclass | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
classes/image.bbclass +2 -1
@@ -172,7 +172,8 @@ fakeroot do_rootfs () { rootfs_${IMAGE_PKGTYPE}_do_rootfs - insert_feed_uris + [ "${ONLINE_PACKAGE_MANAGEMENT}" != "none" ] && \ + insert_feed_uris ${IMAGE_PREPROCESS_COMMAND}
Signature · 1 line
1.7.2.3
Re: [PATCH 3/9] IMAGE_CMD_ext4.xz: rm uncompressed image
In reply to Bernhard Reutner-FischerQuoted 10 lines · Bernhard Reutner-Fischer
Signed-off-by Bernhard Reutner-Fischer<[email protected]>--- conf/bitbake.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)conf/bitbake.conf +0
-0
conf/bitbake.conf IMAGE_CMD_ext3.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 · line 393
Quoted 8 lines
conf/bitbake.conf +1
-1@@ -387,7 +387,7 @@ IMAGE_CMD_ext3.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 IMAGE_CMD_ext4 = "genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac;" IMAGE_CMD_ext4.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; set +e;e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz" IMAGE_CMD_ext4.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.bz2" -IMAGE_CMD_ext4.xz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.xz; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; xz -c ${XZ_COMPRESSION_LEVEL} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4> ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.xz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.xz" +IMAGE_CMD_ext4.xz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.xz; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; xz -c ${XZ_COMPRESSION_LEVEL} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4> ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.xz ; rm -f ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ; rmdir ${DEPLOY_DIR_IMAGE}/tmp.xz" IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -comp lzma"
Any reason we do xz -c < foo rather than just xz foo? Then we wouldn't have to rm...
Signature · 2 lines
Tom Rini Mentor Graphics Corporation
Re: [PATCH 7/9] kernel.bbclass: simplify "if image" condition
In reply to Bernhard Reutner-FischerQuoted 13 lines · Bernhard Reutner-Fischer
Anything that expands image to any false value should not set
INITRAMFS_TASK(instead of just "" or None).Signed-off-by Bernhard Reutner-Fischer<[email protected]>--- classes/kernel.bbclass | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)classes/kernel.bbclass +0
-0
classes/kernel.bbclass python __anonymous () { · line 24
Quoted 8 lines
classes/kernel.bbclass +1
-1@@ -18,7 +18,7 @@ python __anonymous () { bb.data.setVar("DEPENDS", depends, d) image = bb.data.getVar('INITRAMFS_IMAGE', d, True) - if image != '' and image is not None: + if image: bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d) machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True)
Er, right below these lines it still does:INITRAMFS_IMAGE ?= ""INITRAMFS_TASK ?= ""
Which would be a problem yes? Or is there some pythonism I'm forgetting?
Signature · 2 lines
Tom Rini Mentor Graphics Corporation
Quoted 11 lines · Bernhard Reutner-Fischer
Hi,
Some independent patchlets. Ok for master?
Bernhard Reutner-Fischer (9):
fakeroot: add 1.14.5, mv 1.12.4 to obsolete packaged-staging.bbclass: improve documentation
ltp: bump version
uclibc: handle some more {machine,distro}_features image.bbclass: only insert feed uris ifONLINE_PACKAGE_MANAGEMENT
util-linux: honour largefile distro feature
Quoted 2 lines
IMAGE_CMD_ext4.xz: rm uncompressed image
kernel.bbclass: simplify "if image" condition
Questions sent separately.
Quoted 1 line
micro: get preferred binutils from sane-toolchain
Don't feel qualified.
Signature · 2 lines
Tom Rini Mentor Graphics Corporation
Tom Rini
Acked-byRe: [PATCH 7/9] kernel.bbclass: simplify "if image" condition
In reply to Tom RiniQuoted 21 lines · Tom Rini
Quoted 20 lines · Bernhard Reutner-Fischer
Anything that expands image to any false value should not set
INITRAMFS_TASK(instead of just "" or None).Signed-off-by Bernhard Reutner-Fischer<[email protected]>---
classes/kernel.bbclass | 2 +-1 files changed, 1 insertions(+), 1 deletions(-)classes/kernel.bbclass +1
-1@@ -18,7 +18,7 @@ python __anonymous () { bb.data.setVar("DEPENDS", depends, d) image = bb.data.getVar('INITRAMFS_IMAGE', d, True) - if image != '' and image is not None: + if image: bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d)
Quoted 7 lines
classes/kernel.bbclass python __anonymous () { · line 24
Quoted 1 line
classes/kernel.bbclass +0
-0machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True)Er, right below these lines it still does:
INITRAMFS_IMAGE?= ""INITRAMFS_TASK?= ""Which would be a problem yes? Or is there some pythonism I'm forgetting?
OK, after some quick IRC conversation, my only concern is the message wasn't clear to me, but the changes are fine. Could it be expanded to say:
Remove some checks because <existing message more or less> means they aren't necessary?
Signature · 2 lines
Tom Rini Mentor Graphics Corporation
Re: [PATCH 3/9] IMAGE_CMD_ext4.xz: rm uncompressed image
In reply to Tom RiniQuoted 17 lines · Tom Rini
Quoted 16 lines · Bernhard Reutner-Fischer
Signed-off-by Bernhard Reutner-Fischer<[email protected]>--- conf/bitbake.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)conf/bitbake.conf +1
-1@@ -387,7 +387,7 @@ IMAGE_CMD_ext3.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 IMAGE_CMD_ext4 = "genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac;" IMAGE_CMD_ext4.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; set +e;e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz" IMAGE_CMD_ext4.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.bz2" -IMAGE_CMD_ext4.xz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.xz; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; xz -c ${XZ_COMPRESSION_LEVEL} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4> ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.xz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.xz" +IMAGE_CMD_ext4.xz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.xz; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; xz -c ${XZ_COMPRESSION_LEVEL} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4> ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.xz ; rm -f ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ; rmdir ${DEPLOY_DIR_IMAGE}/tmp.xz"
Quoted 5 lines
conf/bitbake.conf IMAGE_CMD_ext3.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 · line 393
Quoted 2 lines
conf/bitbake.conf +0
-0IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -comp lzma"Any reason we do xz -c < foo rather than just xz foo? Then we wouldn't have to rm...
yea, not really, but:
khem, re 3/9: The whole IMAGE generation is a pile of crap. We genext2fs more often than i can count without stuttering
khem, there should be an .ext2 task and we can make ext{3,4}{,.{Z,gz,bz2,xz}} out of that basic .ext2
Re: [PATCH 7/9] kernel.bbclass: simplify "if image" condition
In reply to Tom RiniQuoted 28 lines · Tom Rini
Quoted 27 lines · Tom Rini
Quoted 13 lines · Bernhard Reutner-Fischer
Anything that expands image to any false value should not set
INITRAMFS_TASK(instead of just "" or None).Signed-off-by Bernhard Reutner-Fischer<[email protected]>---
classes/kernel.bbclass | 2 +-1 files changed, 1 insertions(+), 1 deletions(-)classes/kernel.bbclass +0
-0classes/kernel.bbclass python __anonymous () { · line 24
Quoted 8 lines
classes/kernel.bbclass +1
-1@@ -18,7 +18,7 @@ python __anonymous () { bb.data.setVar("DEPENDS", depends, d) image = bb.data.getVar('INITRAMFS_IMAGE', d, True) - if image != '' and image is not None: + if image: bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d) machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True)Er, right below these lines it still does:
INITRAMFS_IMAGE?= ""INITRAMFS_TASK?= ""
Quoted 7 lines
Quoted 1 line
Which would be a problem yes? Or is there some pythonism I'm forgetting?
OK, after some quick IRC conversation, my only concern is the message wasn't clear to me, but the changes are fine. Could it be expanded to say:
Remove some checks because <existing message more or less> means they aren't necessary?
Remove superfluous checks since testing for any False, None or empty object yields False in python.
I'll phrase it like this. Thanks!
Quoted 3 lines
Acked-by Tom Rini <[email protected]>
Re: [PATCH 9/9] util-linux: honour largefile distro feature
In reply to Bernhard Reutner-FischerQuoted 31 lines · Bernhard Reutner-Fischer
do_installon micro-image still broken (${bindir}/hexdump lives in ${usrbindir}/hexdump from util-linux POV. Not fixing these.)Signed-off-by Bernhard Reutner-Fischer <[email protected]>---
recipes/util-linux/files/MCONFIG | 1 -
recipes/util-linux/util-linux.inc | 4 +++-2 files changed, 3 insertions(+), 2 deletions(-)recipes/util-linux/files/MCONFIG +0
-1@@ -206,7 +206,6 @@ endif CFLAGS := $(OPT) -I$(LIB) $(WARNFLAGS) \ $(CURSESFLAGS) $(SLANGFLAGS) $(NLSFLAGS) \ - -D_FILE_OFFSET_BITS=64 \ -DSBINDIR=\"$(SBIN_DIR)\" \ -DUSRSBINDIR=\"$(USRSBIN_DIR)\" \ -DLOGDIR=\"$(LOG_DIR)\" \recipes/util-linux/util-linux.inc +0
-0@@ -2,7 +2,7 @@ DESCRIPTION = "Util-linux is a suite of essential utilities for any Linux systemSECTION = "base"
LICENSE = "GPL"
DEPENDS = "zlib ncurses"recipes/util-linux/util-linux.inc +1
-1-INC_PR = "r16" +INC_PR = "r17"
Quoted 2 lines
inherit autotools
this has potential of breaking the distros which dont yet define largefile in DISTRO_FEATURES so please consider the distros and see if it does not impact
them unknowingly
Quoted 19 lines
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux/util-linux-${PV}.tar.bz2 \
recipes/util-linux/util-linux.inc +0
-0@@ -30,6 +30,8 @@ FILES_util-linux-readprofile = "/usr/sbin/readprofile"RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile " RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"
recipes/util-linux/util-linux.inc +2
-0+CFLAGS_append = "${@base_contains('DISTRO_FEATURES', 'largefile', '-D_FILE_OFFSET_BITS=64', '', d)}" +do_compile () {
set -e
install ${WORKDIR}/MCONFIG ${S}/MCONFIG
--
1.7.2.3_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [PATCH 2/9] packaged-staging.bbclass: improve documentation
In reply to Bernhard Reutner-Fischerclasses/packaged-staging.bbclass line 12
Quoted 5 lines
classes/packaged-staging.bbclass +4
-0+# To use the prebuilt pstage packages, save them away.. +# $ rsync --delete -a tmp/pstage/ /there/oe/build/pstage_mirror +# .. and use it as mirror in your conf/local.conf: +# PSTAGE_MIRROR = "file:///there/oe/build/pstage_mirror"
This is indeed a very helpful comment, I can remember I had to spend some time before figuring this out.
Fabrice
Re: [PATCH 3/9] IMAGE_CMD_ext4.xz: rm uncompressed image
In reply to Bernhard Reutner-FischerQuoted 24 lines · Bernhard Reutner-Fischer
Quoted 17 lines · Tom Rini
Quoted 16 lines · Bernhard Reutner-Fischer
Signed-off-by Bernhard Reutner-Fischer<[email protected]>--- conf/bitbake.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)conf/bitbake.conf +1
-1@@ -387,7 +387,7 @@ IMAGE_CMD_ext3.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 IMAGE_CMD_ext4 = "genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac;" IMAGE_CMD_ext4.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; set +e;e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz" IMAGE_CMD_ext4.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.bz2" -IMAGE_CMD_ext4.xz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.xz; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; xz -c ${XZ_COMPRESSION_LEVEL} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4> ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.xz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.xz" +IMAGE_CMD_ext4.xz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.xz; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; xz -c ${XZ_COMPRESSION_LEVEL} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4> ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.xz ; rm -f ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ; rmdir ${DEPLOY_DIR_IMAGE}/tmp.xz"Quoted 5 lines
conf/bitbake.conf IMAGE_CMD_ext3.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 · line 393
Quoted 2 lines
conf/bitbake.conf +0
-0IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -comp lzma"Any reason we do xz -c< foo rather than just xz foo? Then we wouldn't have to rm...
Quoted 5 lines
yea, not really, but:
khem, re 3/9: The whole IMAGE generation is a pile of crap. We genext2fs more often than i can count without stuttering
khem, there should be an .ext2 task and we can make ext{3,4}{,.{Z,gz,bz2,xz}} out of that basic .ext2
True, and it' even worse when you add that each of those formats can also be mkimage'd for u-boot.
Signature · 2 lines
Tom Rini Mentor Graphics Corporation