busybox: factorize recipes
PATCH 1/7 busybox: factorize recipes
--- recipes/busybox/busybox_1.13.2.bb | 45 ++------------------------- recipes/busybox/busybox_1.14.3.bb | 47 ++--------------------------- recipes/busybox/busybox_1.15.3.bb | 48 +++--------------------------- recipes/busybox/busybox_1.16.2.bb | 59 ++----------------------------------- recipes/busybox/busybox_1.17.1.bb | 55 +--------------------------------- recipes/busybox/busybox_1.1x.inc | 53 +++++++++++++++++++++++++++++++++ 6 files changed, 69 insertions(+), 238 deletions(-) create mode 100644 recipes/busybox/busybox_1.1x.inc
recipes/busybox/busybox_1.13.2.bb +4 -41
@@ -1,8 +1,8 @@ require busybox.inc +require busybox_1.1x.inc PR = "${INC_PR}.3" -SRC_URI = "\ - http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ +SRC_URI += "\ file://busybox-1.13.2-awk.patch \ file://busybox-1.13.2-depmod.patch \ file://busybox-1.13.2-init.patch \
@@ -16,45 +16,8 @@ SRC_URI = "\ file://busybox-1.13.2-unzip.patch \ file://busybox-1.13.2-wget.patch \ file://busybox-1.13.2-make382.patch \ - file://fdisk_nios2.patch \ - \ - file://udhcpscript.patch \ - file://udhcpc-fix-nfsroot.patch \ file://udhcpc-background.patch \ - file://B921600.patch \ - file://get_header_tar.patch \ - file://busybox-appletlib-dependency.patch \ - file://find-touchscreen.sh \ - file://busybox-cron \ - file://busybox-httpd \ - file://busybox-udhcpd \ - file://default.script file://simple.script \ - file://hwclock.sh \ - file://hwclock-default \ - file://mount.busybox \ - file://mountall \ - file://syslog \ - file://syslog.conf \ - file://umount.busybox \ - file://defconfig \ - file://mdev \ - file://mdev.conf \ " -SRC_URI[tarball.md5sum] = "9e2a604d18bef219a5a6bf3acf78b9e1" -SRC_URI[tarball.sha256sum] = "927774408bd982dd246fb716bb2e646ab0708ce321b42c5e271dc98c1f5d1dc8" -EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" - -do_configure_prepend () { - if [ "${TARGET_ARCH}" = "avr32" ] ; then - sed -i s:CONFIG_FEATURE_OSF_LABEL=y:CONFIG_FEATURE_OSF_LABEL=n: ${WORKDIR}/defconfig - fi -} - -do_install_append() { - install -m 0644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/ - install -d ${D}${sysconfdir}/init.d/ - install -d ${D}${sysconfdir}/mdev - install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev/ - install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/ -} +SRC_URI[md5sum] = "9e2a604d18bef219a5a6bf3acf78b9e1" +SRC_URI[sha256sum] = "927774408bd982dd246fb716bb2e646ab0708ce321b42c5e271dc98c1f5d1dc8"
recipes/busybox/busybox_1.14.3.bb +3 -44
52 lines not on this page · raw message
recipes/busybox/busybox_1.15.3.bb +5 -43
60 lines not on this page · raw message
recipes/busybox/busybox_1.16.2.bb +3 -56
65 lines not on this page · raw message
recipes/busybox/busybox_1.17.1.bb +1 -54
62 lines not on this page · raw message
recipes/busybox/busybox_1.1x.inc new file +53 -0
53 lines not on this page · raw message
Signature · 1 line
1.6.3.3
PATCH 2/7 busybox-1.17.1: add fixes from upstream
--- .../busybox-1.17.1/busybox-1.17.1-grep.patch | 39 +++++++ .../busybox-1.17.1/busybox-1.17.1-make.patch | 32 ++++++ .../busybox-1.17.1/busybox-1.17.1-mdev.patch | 49 ++++++++ .../busybox-1.17.1/busybox-1.17.1-mktemp.patch | 12 ++ .../busybox-1.17.1/busybox-1.17.1-sed.patch | 117 ++++++++++++++++++++ .../busybox-1.17.1/busybox-1.17.1-shell.patch | 105 ++++++++++++++++++ recipes/busybox/busybox_1.17.1.bb | 9 ++ 7 files changed, 363 insertions(+), 0 deletions(-) create mode 100644 recipes/busybox/busybox-1.17.1/busybox-1.17.1-grep.patch create mode 100644 recipes/busybox/busybox-1.17.1/busybox-1.17.1-make.patch create mode 100644 recipes/busybox/busybox-1.17.1/busybox-1.17.1-mdev.patch create mode 100644 recipes/busybox/busybox-1.17.1/busybox-1.17.1-mktemp.patch create mode 100644 recipes/busybox/busybox-1.17.1/busybox-1.17.1-sed.patch create mode 100644 recipes/busybox/busybox-1.17.1/busybox-1.17.1-shell.patch
recipes/busybox/busybox-1.17.1/busybox-1.17.1-grep.patch new file +39 -0
@@ -0,0 +1,39 @@ +diff -urpN busybox-1.17.1/findutils/grep.c busybox-1.17.1-grep/findutils/grep.c +--- busybox-1.17.1/findutils/grep.c 2010-07-06 04:25:54.000000000 +0200 ++++ busybox-1.17.1-grep/findutils/grep.c 2010-08-23 02:37:08.000000000 +0200 +@@ -461,15 +461,19 @@ static int grep_file(FILE *file) + if (found) + print_line(gl->pattern, strlen(gl->pattern), linenum, ':'); + } else while (1) { ++ unsigned start = gl->matched_range.rm_so; + unsigned end = gl->matched_range.rm_eo; ++ unsigned len = end - start; + char old = line[end]; + line[end] = '\0'; +- print_line(line + gl->matched_range.rm_so, +- end - gl->matched_range.rm_so, +- linenum, ':'); ++ /* Empty match is not printed: try "echo test | grep -o ''" */ ++ if (len != 0) ++ print_line(line + start, len, linenum, ':'); + if (old == '\0') + break; + line[end] = old; ++ if (len == 0) ++ end++; + #if !ENABLE_EXTRA_COMPAT + if (regexec(&gl->compiled_regex, line + end, + 1, &gl->matched_range, REG_NOTBOL) != 0) +diff -urpN busybox-1.17.1/testsuite/grep.tests busybox-1.17.1-grep/testsuite/grep.tests +--- busybox-1.17.1/testsuite/grep.tests 2010-07-06 04:25:54.000000000 +0200 ++++ busybox-1.17.1-grep/testsuite/grep.tests 2010-08-23 02:37:08.000000000 +0200 +@@ -98,5 +98,9 @@ testing "grep -o does not loop forever" + 'grep -o "[^/]*$"' \ + "test\n" \ + "" "/var/test\n" ++testing "grep -o does not loop forever on zero-length match" \ ++ 'grep -o "" | head -n1' \ ++ "" \ ++ "" "test\n" + + exit $FAILCOUNT
recipes/busybox/busybox-1.17.1/busybox-1.17.1-make.patch new file +32 -0
@@ -0,0 +1,32 @@ +diff -urpN busybox-1.17.1/Makefile busybox-1.17.1-make/Makefile +--- busybox-1.17.1/Makefile 2010-07-25 00:13:44.000000000 +0200 ++++ busybox-1.17.1-make/Makefile 2010-08-22 09:30:33.000000000 +0200 +@@ -433,7 +433,12 @@ ifeq ($(config-targets),1) + -include $(srctree)/arch/$(ARCH)/Makefile + export KBUILD_DEFCONFIG + +-config %config: scripts_basic outputmakefile gen_build_files FORCE ++config: scripts_basic outputmakefile gen_build_files FORCE ++ $(Q)mkdir -p include ++ $(Q)$(MAKE) $(build)=scripts/kconfig $@ ++ $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease ++ ++%config: scripts_basic outputmakefile gen_build_files FORCE + $(Q)mkdir -p include + $(Q)$(MAKE) $(build)=scripts/kconfig $@ + $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease +@@ -1285,9 +1290,13 @@ endif + $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) + + # Modules +-/ %/: prepare scripts FORCE ++%/: prepare scripts FORCE + $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ + $(build)=$(build-dir) ++/: prepare scripts FORCE ++ $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ ++ $(build)=$(build-dir) ++ + %.ko: prepare scripts FORCE + $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ + $(build)=$(build-dir) $(@:.ko=.o)
recipes/busybox/busybox-1.17.1/busybox-1.17.1-mdev.patch new file +49 -0
49 lines not on this page · raw message
recipes/busybox/busybox-1.17.1/busybox-1.17.1-mktemp.patch new file +12 -0
@@ -0,0 +1,12 @@ +diff -urpN busybox-1.17.1/debianutils/mktemp.c busybox-1.17.1-mktemp/debianutils/mktemp.c +--- busybox-1.17.1/debianutils/mktemp.c 2010-07-25 00:12:56.000000000 +0200 ++++ busybox-1.17.1-mktemp/debianutils/mktemp.c 2010-07-27 08:21:26.000000000 +0200 +@@ -50,7 +50,7 @@ int mktemp_main(int argc UNUSED_PARAM, c + opts = getopt32(argv, "dqtp:", &path); + + chp = argv[optind] ? argv[optind] : xstrdup("tmp.XXXXXX"); +- if (chp[0] != '/' || (opts & 8)) ++ if (!strchr(chp, '/') || (opts & 8)) + chp = concat_path_file(path, chp); + + if (opts & 1) { /* -d */
recipes/busybox/busybox-1.17.1/busybox-1.17.1-sed.patch new file +117 -0
117 lines not on this page · raw message
recipes/busybox/busybox-1.17.1/busybox-1.17.1-shell.patch new file +105 -0
105 lines not on this page · raw message
recipes/busybox/busybox_1.17.1.bb +9 -0
@@ -4,5 +4,14 @@ PR = "${INC_PR}" DEFAULT_PREFERENCE = "-1" +SRC_URI += "\ + file://busybox-1.17.1-grep.patch \ + file://busybox-1.17.1-make.patch \ + file://busybox-1.17.1-mdev.patch \ + file://busybox-1.17.1-mktemp.patch \ + file://busybox-1.17.1-sed.patch \ + file://busybox-1.17.1-shell.patch \ +" + SRC_URI[md5sum] = "c7fe7533b7fc4018b0b49a05ee0ee601" SRC_URI[sha256sum] = "bf9177810d7e151b0e662477c33b9afd062570e6298ec46f2a8397a6a839d164"
Signature · 1 line
1.6.3.3
PATCH 3/7 busybox: add 1.17.3
this patch adds the 1.17.3 release of busybox and its up to date patches.
--- recipes/busybox/busybox-1.17.3/B921600.patch | 13 + .../busybox-1.17.3/busybox-1.17.3-dnsd.patch | 12 + .../busybox-1.17.3/busybox-1.17.3-sort.patch | 12 + .../busybox-1.17.3/busybox-1.17.3-unicode.patch | 12 + recipes/busybox/busybox-1.17.3/defconfig | 873 ++++++++++++++++++++ recipes/busybox/busybox-1.17.3/fdisk_nios2.patch | 13 + .../busybox/busybox-1.17.3/get_header_tar.patch | 11 + .../busybox-1.17.3/udhcpc-fix-nfsroot.patch | 47 ++ recipes/busybox/busybox-1.17.3/udhcpscript.patch | 13 + recipes/busybox/busybox_1.17.3.bb | 14 + 10 files changed, 1020 insertions(+), 0 deletions(-) create mode 100644 recipes/busybox/busybox-1.17.3/B921600.patch create mode 100644 recipes/busybox/busybox-1.17.3/busybox-1.17.3-dnsd.patch create mode 100644 recipes/busybox/busybox-1.17.3/busybox-1.17.3-sort.patch create mode 100644 recipes/busybox/busybox-1.17.3/busybox-1.17.3-unicode.patch create mode 100644 recipes/busybox/busybox-1.17.3/defconfig create mode 100644 recipes/busybox/busybox-1.17.3/fdisk_nios2.patch create mode 100644 recipes/busybox/busybox-1.17.3/get_header_tar.patch create mode 100644 recipes/busybox/busybox-1.17.3/udhcpc-fix-nfsroot.patch create mode 100644 recipes/busybox/busybox-1.17.3/udhcpscript.patch create mode 100644 recipes/busybox/busybox_1.17.3.bb
recipes/busybox/busybox-1.17.3/B921600.patch new file +13 -0
@@ -0,0 +1,13 @@ +diff -upNr busybox-1.7.2/libbb/speed_table.c busybox-1.7.2-921600/libbb/speed_table.c +--- busybox-1.7.2/libbb/speed_table.c 2007-09-03 13:48:41.000000000 +0200 ++++ busybox-1.7.2-921600/libbb/speed_table.c 2008-10-09 16:23:26.269592899 +0200 +@@ -52,6 +52,9 @@ static const struct speed_map speeds[] = + #ifdef B460800 + {B460800, 460800/256 + 0x8000U}, + #endif ++#ifdef B921600 ++ {B921600, 921600/256 + 0x8000U}, ++#endif + }; + + enum { NUM_SPEEDS = ARRAY_SIZE(speeds) };
recipes/busybox/busybox-1.17.3/busybox-1.17.3-dnsd.patch new file +12 -0
@@ -0,0 +1,12 @@ +diff -urpN busybox-1.17.3/networking/dnsd.c busybox-1.17.3-dnsd/networking/dnsd.c +--- busybox-1.17.3/networking/dnsd.c 2010-10-09 21:57:14.000000000 +0200 ++++ busybox-1.17.3-dnsd/networking/dnsd.c 2010-10-29 00:37:43.066043841 +0200 +@@ -388,7 +388,7 @@ static int process_packet(struct dns_ent + query_len = strlen(query_string) + 1; + /* may be unaligned! */ + unaligned_type_class = (void *)(query_string + query_len); +- query_len += sizeof(unaligned_type_class); ++ query_len += sizeof(*unaligned_type_class); + /* where to append answer block */ + answb = (void *)(unaligned_type_class + 1); +
recipes/busybox/busybox-1.17.3/busybox-1.17.3-sort.patch new file +12 -0
@@ -0,0 +1,12 @@ +diff -urpN busybox-1.17.3/coreutils/sort.c busybox-1.17.3-sort/coreutils/sort.c +--- busybox-1.17.3/coreutils/sort.c 2010-10-09 21:57:13.000000000 +0200 ++++ busybox-1.17.3-sort/coreutils/sort.c 2010-10-20 15:17:35.320293543 +0200 +@@ -412,7 +412,7 @@ int sort_main(int argc UNUSED_PARAM, cha + #if ENABLE_FEATURE_SORT_BIG + /* Open output file _after_ we read all input ones */ + if (option_mask32 & FLAG_o) +- xmove_fd(xopen3(str_o, O_WRONLY, 0666), STDOUT_FILENO); ++ xmove_fd(xopen3(str_o, O_WRONLY|O_CREAT|O_TRUNC, 0666), STDOUT_FILENO); + #endif + flag = (option_mask32 & FLAG_z) ? '\0' : '\n'; + for (i = 0; i < linecount; i++)
recipes/busybox/busybox-1.17.3/busybox-1.17.3-unicode.patch new file +12 -0
@@ -0,0 +1,12 @@ +diff -urpN busybox-1.17.3/libbb/unicode.c busybox-1.17.3-unicode/libbb/unicode.c +--- busybox-1.17.3/libbb/unicode.c 2010-10-09 21:58:13.000000000 +0200 ++++ busybox-1.17.3-unicode/libbb/unicode.c 2010-10-29 00:48:36.951494079 +0200 +@@ -1006,7 +1006,7 @@ static char* FAST_FUNC unicode_conv_to_p + } + } + if (stats) +- stats->byte_count = stats->unicode_count = (d - dst); ++ stats->byte_count = stats->unicode_count = stats->unicode_width = (d - dst); + return dst; + } +
recipes/busybox/busybox-1.17.3/defconfig new file +873 -0
873 lines not on this page · raw message
recipes/busybox/busybox-1.17.3/fdisk_nios2.patch new file +13 -0
@@ -0,0 +1,13 @@ +Index: busybox-1.15.3/util-linux/fdisk_osf.c +=================================================================== +--- busybox-1.15.3.orig/util-linux/fdisk_osf.c ++++ busybox-1.15.3/util-linux/fdisk_osf.c +@@ -44,7 +44,7 @@ + #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec" + + #if defined(i386) || defined(__sparc__) || defined(__arm__) \ +- || defined(__m68k__) || defined(__mips__) || defined(__s390__) \ ++ || defined(__m68k__) || defined(__mips__) || defined(__nios2__) \ + || defined(__s390__) || defined(__s390x__) \ + || defined(__sh__) || defined(__x86_64__) || defined(__avr32__) + # define BSD_LABELSECTOR 1
recipes/busybox/busybox-1.17.3/get_header_tar.patch new file +11 -0
@@ -0,0 +1,11 @@ +--- busybox-1.13.2/archival/libunarchive/get_header_tar.c.orig 2008-11-09 18:28:02.000000000 +0100 ++++ busybox-1.13.2/archival/libunarchive/get_header_tar.c 2009-02-11 22:34:52.000000000 +0100 +@@ -252,6 +252,8 @@ + file_header->name = concat_path_file(tar.prefix, tar.name); + } else + file_header->name = xstrdup(tar.name); ++ if (strlen(file_header->name) > 100) ++ file_header->name[100] = 0; + } + + /* Set bits 12-15 of the files mode */
recipes/busybox/busybox-1.17.3/udhcpc-fix-nfsroot.patch new file +47 -0
47 lines not on this page · raw message
recipes/busybox/busybox-1.17.3/udhcpscript.patch new file +13 -0
@@ -0,0 +1,13 @@ +Index: busybox-1.15.1/examples/udhcp/simple.script +=================================================================== +--- busybox-1.15.1.orig/examples/udhcp/simple.script 2009-09-12 17:55:36.000000000 +0200 ++++ busybox-1.15.1/examples/udhcp/simple.script 2009-09-16 22:51:06.599693412 +0200 +@@ -22,7 +22,7 @@ case "$1" in + + if [ -n "$router" ] ; then + echo "Deleting routers" +- while route del default gw 0.0.0.0 dev $interface ; do ++ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do + : + done +
recipes/busybox/busybox_1.17.3.bb new file +14 -0
@@ -0,0 +1,14 @@ +require busybox.inc +require busybox_1.1x.inc +PR = "${INC_PR}" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI += "\ + file://busybox-1.17.3-sort.patch \ + file://busybox-1.17.3-dnsd.patch \ + file://busybox-1.17.3-unicode.patch \ +" + +SRC_URI[md5sum] = "a2ce1a951571da8c6e0eaf75b1acef60" +SRC_URI[sha256sum] = "de2f0274f61a068d75ad33861e0982e99c6b625681460ce420222371c3511ff2"
Signature · 1 line
1.6.3.3
PATCH 4/7 busybox's mdev: add script to populate /dev/bus/usb
this patch allows libusb to work on kernel configured without CONFIG_USB_DEVICEFS
--- recipes/busybox/busybox_1.1x.inc | 2 ++ recipes/busybox/files/mdev.conf | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-)
recipes/busybox/busybox_1.1x.inc +2 -0
@@ -23,6 +23,7 @@ SRC_URI = "\ file://defconfig \ file://mdev \ file://mdev.conf \ + file://usb.sh \ " EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
@@ -38,6 +39,7 @@ do_install_append() { install -d ${D}${sysconfdir}/init.d/ install -d ${D}${sysconfdir}/mdev install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev/ + install -m 0755 ${WORKDIR}/usb.sh ${D}${sysconfdir}/mdev/ install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/ if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then
recipes/busybox/files/mdev.conf +1 -1
@@ -20,7 +20,7 @@ sda 0:6 0640 tty 0:5 0666 tty.* 0:0 0620 urandom 0:0 0666 -usbdev.* 0:0 0660 +usbdev.* 0:0 0660 */etc/mdev/usb.sh vcs.* 0:5 0660 zero 0:0 0666
Signature · 1 line
1.6.3.3
PATCH 5/7 busybox/find-touchscreen: handle input/device case
On a new configuration using 2.6.36 kernel + busybox 1.17.1 , find-toucscreen.sh fails because $MDEV is input/event0 and not event0.
This patch fixes this problem by removing input/ if present in $MDEV.
--- recipes/busybox/files/find-touchscreen.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
recipes/busybox/files/find-touchscreen.sh +2 -0
@@ -1,5 +1,7 @@ #!/bin/sh +MDEV=`echo $MDEV | sed 's#input/##g'` + if [ `egrep "input:.*-e0.*,3,.*a0,1,.*18,.*" /sys/class/input/$MDEV/device/modalias|wc -l` -gt 0 ]; then ln -sf /dev/input/$MDEV /dev/input/touchscreen0 fi
Signature · 1 line
1.6.3.3
PATCH 6/7 qt-4.7: rename qtdemo to qtdemoE for qt4-embedded
in order to stay consistant with 4.6.x releases.
--- recipes/qt4/qt-4.7.0.inc | 5 +++++ recipes/qt4/qt4-embedded_4.7.0.bb | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)
recipes/qt4/qt-4.7.0.inc +5 -0
@@ -60,6 +60,11 @@ do_install_append() { for i in rcc uic moc ; do install -m 0755 ${S}/bin/$i ${D}${bindir}/ done + + #Append an E to the qtdemo file + if [ -n "${QT_LIBINFIX}" ] ; then + mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX} + fi } SRC_URI[md5sum] = "3a2f25b9b115037277f4fb759194a7a5"
recipes/qt4/qt4-embedded_4.7.0.bb +1 -1
@@ -2,7 +2,7 @@ DEFAULT_PREFERENCE = "-1" require qt4-embedded.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
Signature · 1 line
1.6.3.3
PATCH 7/7 qwt: add qwt 5.2.1
this recipe compiles the latest stable version of the QT Widgets for Technical Applications against qt4-embedded. A specific package was created for the example applications.
--- recipes/qwt/qwt_5.2.1.bb | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) create mode 100644 recipes/qwt/qwt_5.2.1.bb
recipes/qwt/qwt_5.2.1.bb new file +33 -0
@@ -0,0 +1,33 @@ +DESCRIPTION = "Qt Widget Extension for Technical Applications" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "QWT+LGPL" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}/${PV}/${PN}-${PV}.tar.bz2 \ + " + +inherit qt4e + +do_configure_prepend() { + sed -e 's#/usr/local/qwt-5.2.1#/usr#g' -i qwtconfig.pri + sed -e 's/#CONFIG += QwtExamples/CONFIG += QwtExamples/g' -i qwtconfig.pri +} +do_install() { + make install INSTALL_ROOT=${D} + cd examples + install -d ${D}/${bindir} + cp -pPR bin/* ${D}/${bindir} + install -d ${D}/${docdir}/${PN}-${PV} + mv ${D}/usr/doc/html/* ${D}/${docdir}/${PN}-${PV} + install -d ${D}${mandir}/ + mv ${D}/usr/doc/man/* ${D}${mandir}/ +} + +PACKAGES += "${PN}-examples" + +FILES_${PN}-examples = "${bindir}/*" +FILES_${PN} = "${libdir}/*.so.*" + +SRC_URI[md5sum] = "4a595b8db0ec3856b117836c1d60cb27" +SRC_URI[sha256sum] = "e2b8bb755404cb3dc99e61f3e2d7262152193488f5fbe88524eb698e11ac569f"
Signature · 1 line
1.6.3.3
Re: [PATCH 7/7] qwt: add qwt 5.2.1
Hello,
Thanks for the update.
But am I the only having issue building it?
http://tinderbox.openembedded.org/public/logs/task/9693587.txt
thanks.
BR
Sylvain(aka GarthPS)
2010/10/29 Eric Bénard <[email protected]>
Quoted 60 lines
this recipe compiles the latest stable version of the QT Widgets for Technical Applications against qt4-embedded. A specific package was created for the example applications.
Signed-off-by Eric Bénard <[email protected]>--- recipes/qwt/qwt_5.2.1.bb | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) create mode 100644 recipes/qwt/qwt_5.2.1.bbrecipes/qwt/qwt_5.2.1.bb new file +33
-1@@ -0,0 +1,33 @@ +DESCRIPTION = "Qt Widget Extension for Technical Applications" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "QWT+LGPL" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}/${PV}/${PN}-${PV}.tar.bz2 \ + " + +inherit qt4e + +do_configure_prepend() { + sed -e 's#/usr/local/qwt-5.2.1#/usr#g' -i qwtconfig.pri + sed -e 's/#CONFIG += QwtExamples/CONFIG += QwtExamples/g' -i qwtconfig.pri +} +do_install() { + make install INSTALL_ROOT=${D} + cd examples + install -d ${D}/${bindir} + cp -pPR bin/* ${D}/${bindir} + install -d ${D}/${docdir}/${PN}-${PV} + mv ${D}/usr/doc/html/* ${D}/${docdir}/${PN}-${PV} + install -d ${D}${mandir}/ + mv ${D}/usr/doc/man/* ${D}${mandir}/ +} + +PACKAGES += "${PN}-examples" + +FILES_${PN}-examples = "${bindir}/*" +FILES_${PN} = "${libdir}/*.so.*" + +SRC_URI[md5sum] = "4a595b8db0ec3856b117836c1d60cb27" +SRC_URI[sha256sum] ="
e2b8bb755404cb3dc99e61f3e2d7262152193488f5fbe88524eb698e11ac569f" --
1.6.3.3_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [PATCH 7/7] qwt: add qwt 5.2.1
Hi,
Quoted 5 lines · Sylvain Paré
Thanks for the update.
But am I the only having issue building it?http://tinderbox.openembedded.org/public/logs/task/9693587.txt
are you using the patch which was pushed ?
If yes, it's tested using qt-embedded 4.7 on armv5 & armv6 with angstrom 2010-x distro.
Eric
Re: [PATCH 7/7] qwt: add qwt 5.2.1
Nope, no patch
using it for SHR so with qt-X11
2010/11/6 Eric Bénard <[email protected]>
Quoted 15 lines
Hi,
Quoted 6 lines · Sylvain Paré
Thanks for the update.
But am I the only having issue building it?http://tinderbox.openembedded.org/public/logs/task/9693587.txt
are you using the patch which was pushed ?
If yes, it's tested using qt-embedded 4.7 on armv5 & armv6 with angstrom 2010-x distro.
Eric
Re: [PATCH 6/7] qt-4.7: rename qtdemo to qtdemoE for qt4-embedded
In reply to Eric BénardQuoted 3 lines · Eric B??nard
in order to stay consistant with 4.6.x releases.
Signed-off-by Eric B??nard <[email protected]>
Quoted 42 lines
--- recipes/qt4/qt-4.7.0.inc | 5 +++++ recipes/qt4/qt4-embedded_4.7.0.bb | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)recipes/qt4/qt-4.7.0.inc +5
-0@@ -60,6 +60,11 @@ do_install_append() { for i in rcc uic moc ; do install -m 0755 ${S}/bin/$i ${D}${bindir}/ done + + #Append an E to the qtdemo file + if [ -n "${QT_LIBINFIX}" ] ; then + mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX} + fi } SRC_URI[md5sum] = "3a2f25b9b115037277f4fb759194a7a5"recipes/qt4/qt4-embedded_4.7.0.bb +1
-1@@ -2,7 +2,7 @@ DEFAULT_PREFERENCE = "-1" require qt4-embedded.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" QT_CONFIG_FLAGS_append_armv6 = " -no-neon "Signature · 7 lines
1.6.3.3 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [PATCH 6/7] qt-4.7: rename qtdemo to qtdemoE for qt4-embedded
In reply to Eric BénardQuoted 9 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Eric Bénard
Sent: Friday, October 29, 2010 4:26 PM
To: [email protected]
Subject: [oe] [PATCH 6/7] qt-4.7: rename qtdemo to qtdemoE for qt4- embedded
Quoted 3 lines
in order to stay consistant with 4.6.x releases.
Signed-off-by Eric Bénard <[email protected]>
Quoted 44 lines
--- recipes/qt4/qt-4.7.0.inc | 5 +++++ recipes/qt4/qt4-embedded_4.7.0.bb | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)recipes/qt4/qt-4.7.0.inc +5
-0@@ -60,6 +60,11 @@ do_install_append() { for i in rcc uic moc ; do install -m 0755 ${S}/bin/$i ${D}${bindir}/ done + + #Append an E to the qtdemo file + if [ -n "${QT_LIBINFIX}" ] ; then + mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX} + fi }SRC_URI[md5sum] = "
3a2f25b9b115037277f4fb759194a7a5"recipes/qt4/qt4- renamed from recipes/qt4/qt4-embedded_4.7.0.bb +0
-0embedded_4.7.0.bb
index 1cd43a6..7e3d4b8 100644recipes/qt4/qt4-embedded_4.7.0.bb +1
-2@@ -2,7 +2,7 @@ DEFAULT_PREFERENCE = "-1" require qt4-embedded.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" QT_CONFIG_FLAGS_append_armv6 = " -no-neon " --1.6.3.3
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Quoted 1 line · Eric Bénard
Signed-off-by Eric Bénard <[email protected]>
For patch 1 - 5
Quoted 399 lines
--- recipes/busybox/busybox_1.13.2.bb | 45 ++------------------------- recipes/busybox/busybox_1.14.3.bb | 47 ++--------------------------- recipes/busybox/busybox_1.15.3.bb | 48 +++--------------------------- recipes/busybox/busybox_1.16.2.bb | 59 ++----------------------------------- recipes/busybox/busybox_1.17.1.bb | 55 +--------------------------------- recipes/busybox/busybox_1.1x.inc | 53 +++++++++++++++++++++++++++++++++ 6 files changed, 69 insertions(+), 238 deletions(-) create mode 100644 recipes/busybox/busybox_1.1x.increcipes/busybox/busybox_1.13.2.bb +4
-41@@ -1,8 +1,8 @@ require busybox.inc +require busybox_1.1x.inc PR = "${INC_PR}.3" -SRC_URI = "\ - http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ +SRC_URI += "\ file://busybox-1.13.2-awk.patch \ file://busybox-1.13.2-depmod.patch \ file://busybox-1.13.2-init.patch \@@ -16,45 +16,8 @@ SRC_URI = "\ file://busybox-1.13.2-unzip.patch \ file://busybox-1.13.2-wget.patch \ file://busybox-1.13.2-make382.patch \ - file://fdisk_nios2.patch \ - \ - file://udhcpscript.patch \ - file://udhcpc-fix-nfsroot.patch \ file://udhcpc-background.patch \ - file://B921600.patch \ - file://get_header_tar.patch \ - file://busybox-appletlib-dependency.patch \ - file://find-touchscreen.sh \ - file://busybox-cron \ - file://busybox-httpd \ - file://busybox-udhcpd \ - file://default.script file://simple.script \ - file://hwclock.sh \ - file://hwclock-default \ - file://mount.busybox \ - file://mountall \ - file://syslog \ - file://syslog.conf \ - file://umount.busybox \ - file://defconfig \ - file://mdev \ - file://mdev.conf \ " -SRC_URI[tarball.md5sum] = "9e2a604d18bef219a5a6bf3acf78b9e1" -SRC_URI[tarball.sha256sum] = "927774408bd982dd246fb716bb2e646ab0708ce321b42c5e271dc98c1f5d1dc8" -EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" - -do_configure_prepend () { - if [ "${TARGET_ARCH}" = "avr32" ] ; then - sed -i s:CONFIG_FEATURE_OSF_LABEL=y:CONFIG_FEATURE_OSF_LABEL=n: ${WORKDIR}/defconfig - fi -} - -do_install_append() { - install -m 0644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/ - install -d ${D}${sysconfdir}/init.d/ - install -d ${D}${sysconfdir}/mdev - install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev/ - install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/ -} +SRC_URI[md5sum] = "9e2a604d18bef219a5a6bf3acf78b9e1" +SRC_URI[sha256sum] = "927774408bd982dd246fb716bb2e646ab0708ce321b42c5e271dc98c1f5d1dc8"recipes/busybox/busybox_1.14.3.bb +3
-44@@ -1,49 +1,8 @@ require busybox.inc +require busybox_1.1x.inc PR = "${INC_PR}.1" DEFAULT_PREFERENCE = "-1" -SRC_URI = "\ - http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ - file://fdisk_nios2.patch \ -\ - file://udhcpscript.patch \ - file://udhcpc-fix-nfsroot.patch \ - file://B921600.patch \ - file://get_header_tar.patch \ - file://busybox-appletlib-dependency.patch \ - file://find-touchscreen.sh \ - file://busybox-cron \ - file://busybox-httpd \ - file://busybox-udhcpd \ - file://default.script file://simple.script \ - file://hwclock.sh \ - file://hwclock-default \ - file://mount.busybox \ - file://mountall \ - file://syslog \ - file://syslog.conf \ - file://umount.busybox \ - file://defconfig \ - file://mdev \ - file://mdev.conf \ -" - -SRC_URI[tarball.md5sum] = "d170bf5f97a41aec3a505eab690d5699" -SRC_URI[tarball.sha256sum] = "e94df4f9063a1951b4e94e76148ed80e921737a89d97bc2c310a2a8927982e90" - -EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" - -do_configure_prepend () { - if [ "${TARGET_ARCH}" = "avr32" ] ; then - sed -i s:CONFIG_FEATURE_OSF_LABEL=y:CONFIG_FEATURE_OSF_LABEL=n: ${WORKDIR}/defconfig - fi -} - -do_install_append() { - install -m 0644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/ - install -d ${D}${sysconfdir}/init.d/ - install -d ${D}${sysconfdir}/mdev - install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev/ - install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/ -} +SRC_URI[md5sum] = "d170bf5f97a41aec3a505eab690d5699" +SRC_URI[sha256sum] = "e94df4f9063a1951b4e94e76148ed80e921737a89d97bc2c310a2a8927982e90"recipes/busybox/busybox_1.15.3.bb +5
-43@@ -1,55 +1,17 @@ require busybox.inc +require busybox_1.1x.inc PR = "${INC_PR}.4" -SRC_URI = "\ - http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ - file://fdisk_nios2.patch \ - \ - file://udhcpscript.patch \ - file://udhcpc-fix-nfsroot.patch \ - file://B921600.patch \ - file://get_header_tar.patch \ - file://busybox-appletlib-dependency.patch \ +SRC_URI += "\ file://0000-wget-no-check-certificate.patch \ - file://find-touchscreen.sh \ - file://busybox-cron \ - file://busybox-httpd \ - file://busybox-udhcpd \ - file://default.script file://simple.script \ - file://hwclock.sh \ - file://hwclock-default \ - file://mount.busybox \ - file://mountall \ - file://syslog \ - file://syslog.conf \ - file://umount.busybox \ - file://defconfig \ - file://mdev \ - file://mdev.conf \ " -SRC_URI[tarball.md5sum] = "6059ac9456de6fb18dc8ee4cd0ec9240" -SRC_URI[tarball.sha256sum] = "d74020ad2cc5a4dcc5109c44dbd0e22582d6ce42954b0f1ff29763c8c0ff03cb" + +SRC_URI[md5sum] = "6059ac9456de6fb18dc8ee4cd0ec9240" +SRC_URI[sha256sum] = "d74020ad2cc5a4dcc5109c44dbd0e22582d6ce42954b0f1ff29763c8c0ff03cb" # gcc 4.5 has this bug on thumb # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44557 # so add -fomit-frame-pointer # this will be removed once the above bug is fixed. - CFLAGS_append = " -fomit-frame-pointer" - -EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" - -do_configure_prepend () { - if [ "${TARGET_ARCH}" = "avr32" ] ; then - sed -i s:CONFIG_FEATURE_OSF_LABEL=y:CONFIG_FEATURE_OSF_LABEL=n: ${WORKDIR}/defconfig - fi -} - -do_install_append() { - install -m 0644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/ - install -d ${D}${sysconfdir}/init.d/ - install -d ${D}${sysconfdir}/mdev - install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev/ - install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/ -}recipes/busybox/busybox_1.16.2.bb +3
-56@@ -1,62 +1,9 @@ require busybox.inc +require busybox_1.1x.inc PR = "${INC_PR}.3" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_shr = "1" -SRC_URI = "\ - http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ - file://fdisk_nios2.patch \ - \ - file://udhcpscript.patch \ - file://udhcpc-fix-nfsroot.patch \ - file://B921600.patch \ - file://get_header_tar.patch \ - file://busybox-appletlib-dependency.patch \ -# file://0000-wget-no-check-certificate.patch \ - file://find-touchscreen.sh \ - file://busybox-cron \ - file://busybox-httpd \ - file://busybox-udhcpd \ - file://default.script file://simple.script \ - file://hwclock.sh \ - file://hwclock-default \ - file://mount.busybox \ - file://mountall \ - file://syslog \ - file://syslog.conf \ - file://umount.busybox \ - file://defconfig \ - file://mdev \ - file://mdev.conf \ -" - -SRC_URI[tarball.md5sum] = "2ba980f720a5bdce4ec05423519acc35" -SRC_URI[tarball.sha256sum] = "3bf1b1a41294d25335abdd10c65cffdb01c36337ca011f1b38c6ad89590115ba" - -EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" - -do_configure_prepend () { - if [ "${TARGET_ARCH}" = "avr32" ] ; then - sed -i s:CONFIG_FEATURE_OSF_LABEL=y:CONFIG_FEATURE_OSF_LABEL=n: ${WORKDIR}/defconfig - fi -} - -do_install_append() { - install -m 0644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/ - install -d ${D}${sysconfdir}/init.d/ - install -d ${D}${sysconfdir}/mdev - install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev/ - install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/ - - if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then - install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/ - fi - - if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then - install -d ${D}${sysconfdir}/udhcpc.d - install -d ${D}${datadir}/udhcpc - install -m 0755 ${WORKDIR}/simple.script ${D}${sysconfdir}/udhcpc.d/50default - install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script - fi -} +SRC_URI[md5sum] = "2ba980f720a5bdce4ec05423519acc35" +SRC_URI[sha256sum] = "3bf1b1a41294d25335abdd10c65cffdb01c36337ca011f1b38c6ad89590115ba"recipes/busybox/busybox_1.17.1.bb +1
-54@@ -1,61 +1,8 @@ require busybox.inc +require busybox_1.1x.inc PR = "${INC_PR}" DEFAULT_PREFERENCE = "-1" -SRC_URI = "\ - http://www.busybox.net/downloads/busybox-${PV}.tar.bz2 \ - file://fdisk_nios2.patch \ - \ - file://udhcpscript.patch \ - file://udhcpc-fix-nfsroot.patch \ - file://B921600.patch \ - file://get_header_tar.patch \ - file://busybox-appletlib-dependency.patch \ -# file://0000-wget-no-check-certificate.patch \ - file://find-touchscreen.sh \ - file://busybox-cron \ - file://busybox-httpd \ - file://busybox-udhcpd \ - file://default.script file://simple.script \ - file://hwclock.sh \ - file://hwclock-default \ - file://mount.busybox \ - file://mountall \ - file://syslog \ - file://syslog.conf \ - file://umount.busybox \ - file://defconfig \ - file://mdev \ - file://mdev.conf \ -" - SRC_URI[md5sum] = "c7fe7533b7fc4018b0b49a05ee0ee601" SRC_URI[sha256sum] = "bf9177810d7e151b0e662477c33b9afd062570e6298ec46f2a8397a6a839d164" - -EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" - -do_configure_prepend () { - if [ "${TARGET_ARCH}" = "avr32" ] ; then - sed -i s:CONFIG_FEATURE_OSF_LABEL=y:CONFIG_FEATURE_OSF_LABEL=n: ${WORKDIR}/defconfig - fi -} - -do_install_append() { - install -m 0644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/ - install -d ${D}${sysconfdir}/init.d/ - install -d ${D}${sysconfdir}/mdev - install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev/ - install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/ - - if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then - install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/ - fi - - if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then - install -d ${D}${sysconfdir}/udhcpc.d - install -d ${D}${datadir}/udhcpc - install -m 0755 ${WORKDIR}/simple.script ${D}${sysconfdir}/udhcpc.d/50default - install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script - fi -}recipes/busybox/busybox_1.1x.inc new file +53
-0@@ -0,0 +1,53 @@ +require busybox.inc + +SRC_URI = "\ + http://www.busybox.net/downloads/busybox-${PV}.tar.bz2 \ + file://fdisk_nios2.patch \ + file://udhcpscript.patch \ + file://udhcpc-fix-nfsroot.patch \ + file://B921600.patch \ + file://get_header_tar.patch \ + file://busybox-appletlib-dependency.patch \ + file://find-touchscreen.sh \ + file://busybox-cron \ + file://busybox-httpd \ + file://busybox-udhcpd \ + file://default.script file://simple.script \ + file://hwclock.sh \ + file://hwclock-default \ + file://mount.busybox \ + file://mountall \ + file://syslog \ + file://syslog.conf \ + file://umount.busybox \ + file://defconfig \ + file://mdev \ + file://mdev.conf \ +" + +EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" + +do_configure_prepend () { + if [ "${TARGET_ARCH}" = "avr32" ] ; then + sed -i s:CONFIG_FEATURE_OSF_LABEL=y:CONFIG_FEATURE_OSF_LABEL=n: ${WORKDIR}/defconfig + fi +} + +do_install_append() { + install -m 0644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/ + install -d ${D}${sysconfdir}/init.d/ + install -d ${D}${sysconfdir}/mdev + install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev/ + install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/ + + if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then + install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/ + fi + + if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then + install -d ${D}${sysconfdir}/udhcpc.d + install -d ${D}${datadir}/udhcpc + install -m 0755 ${WORKDIR}/simple.script ${D}${sysconfdir}/udhcpc.d/50default + install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script + fi +}Signature · 7 lines
1.6.3.3 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel