* [Buildroot] [PATCH 1/9] e2fsprogs: bump to 1.41.14 and fixup
@ 2011-01-27 14:21 Gustavo Zacarias
2011-01-27 14:21 ` [Buildroot] [PATCH 2/9] util-linux: convert to autotargets and bump to 2.18 Gustavo Zacarias
` (7 more replies)
0 siblings, 8 replies; 16+ messages in thread
From: Gustavo Zacarias @ 2011-01-27 14:21 UTC (permalink / raw)
To: buildroot
Bump e2fsprogs to version 1.41.14
Also export libblkid properly for util-linux to use.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/e2fsprogs/e2fsprogs.mk | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index f525804..13c94ba 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -3,15 +3,10 @@
# e2fsprogs
#
#############################################################
-E2FSPROGS_VERSION:=1.41.12
-E2FSPROGS_SOURCE=e2fsprogs-$(E2FSPROGS_VERSION).tar.gz
-E2FSPROGS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
-
-E2FSPROGS_AUTORECONF = NO
-E2FSPROGS_LIBTOOL_PATCH = NO
+E2FSPROGS_VERSION = 1.41.14
+E2FSPROGS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
E2FSPROGS_INSTALL_STAGING = YES
-E2FSPROGS_INSTALL_TARGET = YES
E2FSPROGS_CONF_OPT = \
--disable-tls \
@@ -118,5 +113,16 @@ ifeq ($(BR2_PACKAGE_E2FSPROGS_LIBUUID),y)
E2FSPROGS_POST_INSTALL_STAGING_HOOKS += E2FSPROGS_STAGING_LIBUUID_INSTALL
endif
+define E2FSPROGS_STAGING_LIBBLKID_INSTALL
+ install -D $(@D)/lib/blkid/blkid.h \
+ $(STAGING_DIR)/usr/include/blkid/blkid.h
+ install -D $(@D)/lib/blkid/blkid_types.h \
+ $(STAGING_DIR)/usr/include/blkid/blkid_types.h
+endef
+
+ifeq ($(BR2_PACKAGE_E2FSPROGS_LIBBLKID),y)
+E2FSPROGS_POST_INSTALL_STAGING_HOOKS += E2FSPROGS_STAGING_LIBBLKID_INSTALL
+endif
+
$(eval $(call AUTOTARGETS,package,e2fsprogs))
$(eval $(call AUTOTARGETS,package,e2fsprogs,host))
--
1.7.3.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [Buildroot] [PATCH 2/9] util-linux: convert to autotargets and bump to 2.18 2011-01-27 14:21 [Buildroot] [PATCH 1/9] e2fsprogs: bump to 1.41.14 and fixup Gustavo Zacarias @ 2011-01-27 14:21 ` Gustavo Zacarias 2011-01-27 14:43 ` Thomas Petazzoni 2011-01-27 14:21 ` [Buildroot] [PATCH 3/9] uclibc: add BSD endian conversions Gustavo Zacarias ` (6 subsequent siblings) 7 siblings, 1 reply; 16+ messages in thread From: Gustavo Zacarias @ 2011-01-27 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/util-linux/Config.in | 12 +- ...linux-2.13-pre17-hardcode-a-out-constants.patch | 41 -- package/util-linux/util-linux-libmount.patch | 20 + package/util-linux/util-linux-susv3-legacy.patch | 429 -------------------- package/util-linux/util-linux-umount2-fix.patch | 20 - package/util-linux/util-linux.mk | 120 ++---- 6 files changed, 63 insertions(+), 579 deletions(-) delete mode 100644 package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch create mode 100644 package/util-linux/util-linux-libmount.patch delete mode 100644 package/util-linux/util-linux-susv3-legacy.patch delete mode 100644 package/util-linux/util-linux-umount2-fix.patch diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 434dae9..4e3287e 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -1,8 +1,12 @@ -config BR2_PACKAGE_UTIL-LINUX +config BR2_PACKAGE_UTIL_LINUX bool "util-linux" select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE - depends on BR2_INET_RPC + select BR2_PACKAGE_E2FSPROGS if BR2_LARGEFILE + select BR2_PACKAGE_E2FSPROGS_LIBBLKID if BR2_LARGEFILE + select BR2_PACKAGE_E2FSPROGS_LIBUUID if BR2_LARGEFILE + depends on BR2_PROGRAM_INVOCATION + depends on BR2_USE_WCHAR help Various useful/essential Linux utilities. @@ -10,5 +14,5 @@ config BR2_PACKAGE_UTIL-LINUX http://www.kernel.org/pub/linux/utils/util-linux/ -comment "util-linux requires a toolchain with RPC support" - depends on !BR2_INET_RPC +comment "util-linux requires a toolchain with PROGRAM_INVOCATION and WCHAR support" + depends on !(BR2_PROGRAM_INVOCATION && BR2_USE_WCHAR) diff --git a/package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch b/package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch deleted file mode 100644 index b115c41..0000000 --- a/package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch +++ /dev/null @@ -1,41 +0,0 @@ -Hardcode a.out related constants - -The OMAGIC, NMAGIC and ZMAGIC constants, related to the legacy a.out -binary format, are no longer available in the headers of all -architectures, due to this binary format being deprecated. For that -reason, util-linux fails to build. - -We therefore take the approach used in newer versions of -util-linux-ng: hardcoding those values. See -http://git.kernel.org/?p=utils/util-linux-ng/util-linux-ng.git;a=commitdiff;h=e9eb4dad0ece03914f67f6d1ded74cfbbe694ba4 - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> ---- - text-utils/more.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -Index: util-linux-2.13-pre7/text-utils/more.c -=================================================================== ---- util-linux-2.13-pre7.orig/text-utils/more.c -+++ util-linux-2.13-pre7/text-utils/more.c -@@ -53,7 +53,6 @@ - #include <sys/stat.h> - #include <sys/file.h> - #include <sys/wait.h> --#include <a.out.h> - #include <locale.h> - #include "xstrncpy.h" - #include "nls.h" -@@ -504,9 +503,9 @@ - - if (fread(twobytes, 2, 1, f) == 1) { - switch(twobytes[0] + (twobytes[1]<<8)) { -- case OMAGIC: /* 0407 */ -- case NMAGIC: /* 0410 */ -- case ZMAGIC: /* 0413 */ -+ case 0407: /* a.out obj */ -+ case 0410: /* a.out exec */ -+ case 0413: /* a.out demand exec */ - case 0405: - case 0411: - case 0177545: diff --git a/package/util-linux/util-linux-libmount.patch b/package/util-linux/util-linux-libmount.patch new file mode 100644 index 0000000..3cf9f9b --- /dev/null +++ b/package/util-linux/util-linux-libmount.patch @@ -0,0 +1,20 @@ +We need to disable libmount's check for --enable-libblkid otherwise +it assumes we've got nothing even if we're using an external libblkid. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> + +diff -Nura util-linux-ng-2.18.orig/configure.ac util-linux-ng-2.18/configure.ac +--- util-linux-ng-2.18.orig/configure.ac 2010-06-30 09:52:31.000000000 -0300 ++++ util-linux-ng-2.18/configure.ac 2011-01-07 12:09:17.457043328 -0300 +@@ -406,11 +406,6 @@ + [], enable_libmount=yes + ) + +-case "$enable_libblkid:$enable_libmount" in +-no:yes) +- AC_MSG_ERROR([cannot enable libmount when libblkid is disabled]) ;; +-esac +- + AC_SUBST([LIBMOUNT_VERSION]) + AC_SUBST([LIBMOUNT_VERSION_INFO]) + AC_DEFINE_UNQUOTED(LIBMOUNT_VERSION, "$LIBMOUNT_VERSION", [libmount version string]) diff --git a/package/util-linux/util-linux-susv3-legacy.patch b/package/util-linux/util-linux-susv3-legacy.patch deleted file mode 100644 index 2239119..0000000 --- a/package/util-linux/util-linux-susv3-legacy.patch +++ /dev/null @@ -1,429 +0,0 @@ -[PATCH] replace susv3 legacy functions with modern equivalents - -Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> ---- - fdisk/cfdisk.c | 2 +- - fdisk/fdiskbsdlabel.c | 16 ++++++++-------- - fdisk/sfdisk.c | 10 +++++----- - login-utils/login.c | 6 +++--- - login-utils/shutdown.c | 2 +- - login-utils/ttymsg.c | 2 +- - login-utils/vipw.c | 4 ++-- - login-utils/wall.c | 2 +- - misc-utils/logger.c | 2 +- - misc-utils/namei.c | 2 +- - misc-utils/whereis.c | 4 ++-- - mount/mntent.c | 4 ++-- - mount/mount.c | 4 ++-- - mount/mount_by_label.c | 2 +- - mount/sundries.c | 2 +- - mount/umount.c | 2 +- - partx/partx.c | 2 +- - text-utils/colcrt.c | 4 ++-- - text-utils/display.c | 2 +- - text-utils/parse.c | 8 ++++---- - 20 files changed, 41 insertions(+), 41 deletions(-) - -Index: util-linux-2.13-pre7/fdisk/fdiskbsdlabel.c -=================================================================== ---- util-linux-2.13-pre7.orig/fdisk/fdiskbsdlabel.c -+++ util-linux-2.13-pre7/fdisk/fdiskbsdlabel.c -@@ -538,10 +538,10 @@ - - /* We need a backup of the disklabel (xbsd_dlabel might have changed). */ - d = &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE]; -- bcopy (d, &dl, sizeof (struct xbsd_disklabel)); -+ memmove (&dl, d, sizeof (struct xbsd_disklabel)); - - /* The disklabel will be overwritten by 0's from bootxx anyway */ -- bzero (d, sizeof (struct xbsd_disklabel)); -+ memset (d, 0, sizeof (struct xbsd_disklabel)); - - snprintf (path, sizeof(path), "%s/boot%s", bootdir, dkbasename); - if (!xbsd_get_bootstrap (path, &disklabelbuffer[xbsd_dlabel.d_secsize], -@@ -555,7 +555,7 @@ - exit ( EXIT_FAILURE ); - } - -- bcopy (&dl, d, sizeof (struct xbsd_disklabel)); -+ memmove (d, &dl, sizeof (struct xbsd_disklabel)); - - #if defined (__powerpc__) || defined (__hppa__) - sector = 0; -@@ -657,7 +657,7 @@ - struct geom g; - - get_geometry (fd, &g); -- bzero (d, sizeof (struct xbsd_disklabel)); -+ memset (d, 0, sizeof (struct xbsd_disklabel)); - - d -> d_magic = BSD_DISKMAGIC; - -@@ -740,8 +740,8 @@ - if (BSD_BBSIZE != read (fd, disklabelbuffer, BSD_BBSIZE)) - fatal (unable_to_read); - -- bcopy (&disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET], -- d, sizeof (struct xbsd_disklabel)); -+ memmove (d, &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET], -+ sizeof (struct xbsd_disklabel)); - - if (d -> d_magic != BSD_DISKMAGIC || d -> d_magic2 != BSD_DISKMAGIC) - return 0; -@@ -776,8 +776,8 @@ - /* This is necessary if we want to write the bootstrap later, - otherwise we'd write the old disklabel with the bootstrap. - */ -- bcopy (d, &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET], -- sizeof (struct xbsd_disklabel)); -+ memmove (&disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET], -+ d, sizeof (struct xbsd_disklabel)); - - #if defined (__alpha__) && BSD_LABELSECTOR == 0 - alpha_bootblock_checksum (disklabelbuffer); -Index: util-linux-2.13-pre7/login-utils/ttymsg.c -=================================================================== ---- util-linux-2.13-pre7.orig/login-utils/ttymsg.c -+++ util-linux-2.13-pre7/login-utils/ttymsg.c -@@ -111,7 +111,7 @@ - if (wret >= 0) { - left -= wret; - if (iov != localiov) { -- bcopy(iov, localiov, -+ memmove(localiov, iov, - iovcnt * sizeof(struct iovec)); - iov = localiov; - } -Index: util-linux-2.13-pre7/login-utils/vipw.c -=================================================================== ---- util-linux-2.13-pre7.orig/login-utils/vipw.c -+++ util-linux-2.13-pre7/login-utils/vipw.c -@@ -313,8 +313,8 @@ - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); - -- bzero(tmp_file, FILENAMELEN); -- progname = (rindex(argv[0], '/')) ? rindex(argv[0], '/') + 1 : argv[0]; -+ memset(tmp_file, 0, FILENAMELEN); -+ progname = (strrchr(argv[0], '/')) ? strrchr(argv[0], '/') + 1 : argv[0]; - if (!strcmp(progname, "vigr")) { - program = VIGR; - xstrncpy(orig_file, GROUP_FILE, sizeof(orig_file)); -Index: util-linux-2.13-pre7/misc-utils/logger.c -=================================================================== ---- util-linux-2.13-pre7.orig/misc-utils/logger.c -+++ util-linux-2.13-pre7/misc-utils/logger.c -@@ -198,7 +198,7 @@ - } else { - if (p != buf) - *p++ = ' '; -- bcopy(*argv++, p, len); -+ memmove(p, *argv++, len); - *(p += len) = '\0'; - } - } -Index: util-linux-2.13-pre7/misc-utils/namei.c -=================================================================== ---- util-linux-2.13-pre7.orig/misc-utils/namei.c -+++ util-linux-2.13-pre7/misc-utils/namei.c -@@ -242,7 +242,7 @@ - * call namei() - */ - -- bzero(sym, BUFSIZ); -+ memset(sym, 0, BUFSIZ); - if(readlink(buf, sym, BUFSIZ) == -1){ - (void)printf(_(" ? problems reading symlink %s - %s (%d)\n"), buf, ERR); - return; -Index: util-linux-2.13-pre7/text-utils/colcrt.c -=================================================================== ---- util-linux-2.13-pre7.orig/text-utils/colcrt.c -+++ util-linux-2.13-pre7/text-utils/colcrt.c -@@ -252,8 +252,8 @@ - } - putwchar('\n'); - } -- bcopy(page[ol], page, (267 - ol) * 132 * sizeof(wchar_t)); -- bzero(page[267- ol], ol * 132 * sizeof(wchar_t)); -+ memmove(page, page[ol], (267 - ol) * 132 * sizeof(wchar_t)); -+ memset(page[267- ol], 0, ol * 132 * sizeof(wchar_t)); - outline -= ol; - outcol = 0; - first = 1; -Index: util-linux-2.13-pre7/fdisk/sfdisk.c -=================================================================== ---- util-linux-2.13-pre7.orig/fdisk/sfdisk.c -+++ util-linux-2.13-pre7/fdisk/sfdisk.c -@@ -40,7 +40,7 @@ - #include <unistd.h> /* read, write */ - #include <fcntl.h> /* O_RDWR */ - #include <errno.h> /* ERANGE */ --#include <string.h> /* index() */ -+#include <string.h> /* strchr() */ - #include <ctype.h> - #include <getopt.h> - #include <sys/ioctl.h> -@@ -1709,12 +1709,12 @@ - eof = 1; - return RD_EOF; - } -- if (!(lp = index(lp, '\n'))) -+ if (!(lp = strchr(lp, '\n'))) - fatal(_("long or incomplete input line - quitting\n")); - *lp = 0; - - /* remove comments, if any */ -- if ((lp = index(line+2, '#')) != 0) -+ if ((lp = strchr(line+2, '#')) != 0) - *lp = 0; - - /* recognize a few commands - to be expanded */ -@@ -1724,7 +1724,7 @@ - } - - /* dump style? - then bad input is fatal */ -- if ((ip = index(line+2, ':')) != 0) { -+ if ((ip = strchr(line+2, ':')) != 0) { - struct dumpfld *d; - - nxtfld: -@@ -2491,7 +2491,7 @@ - - if (argc < 1) - fatal(_("no command?\n")); -- if ((progn = rindex(argv[0], '/')) == NULL) -+ if ((progn = strrchr(argv[0], '/')) == NULL) - progn = argv[0]; - else - progn++; -Index: util-linux-2.13-pre7/login-utils/login.c -=================================================================== ---- util-linux-2.13-pre7.orig/login-utils/login.c -+++ util-linux-2.13-pre7/login-utils/login.c -@@ -337,7 +337,7 @@ - */ - gethostname(tbuf, sizeof(tbuf)); - xstrncpy(thishost, tbuf, sizeof(thishost)); -- domain = index(tbuf, '.'); -+ domain = strchr(tbuf, '.'); - - username = tty_name = hostname = NULL; - fflag = hflag = pflag = 0; -@@ -356,7 +356,7 @@ - exit(1); - } - hflag = 1; -- if (domain && (p = index(optarg, '.')) && -+ if (domain && (p = strchr(optarg, '.')) && - strcasecmp(p, domain) == 0) - *p = 0; - -@@ -1101,7 +1101,7 @@ - childArgv[childArgc++] = buff; - } else { - tbuf[0] = '-'; -- xstrncpy(tbuf + 1, ((p = rindex(pwd->pw_shell, '/')) ? -+ xstrncpy(tbuf + 1, ((p = strrchr(pwd->pw_shell, '/')) ? - p + 1 : pwd->pw_shell), - sizeof(tbuf)-1); - -Index: util-linux-2.13-pre7/login-utils/shutdown.c -=================================================================== ---- util-linux-2.13-pre7.orig/login-utils/shutdown.c -+++ util-linux-2.13-pre7/login-utils/shutdown.c -@@ -279,7 +279,7 @@ - if (fgets (line, sizeof(line), fp) != NULL && - strncasecmp (line, "HALT_ACTION", 11) == 0 && - iswhitespace(line[11])) { -- p = index(line, '\n'); -+ p = strchr(line, '\n'); - if (p) - *p = 0; /* strip final '\n' */ - p = line+11; -Index: util-linux-2.13-pre7/misc-utils/whereis.c -=================================================================== ---- util-linux-2.13-pre7.orig/misc-utils/whereis.c -+++ util-linux-2.13-pre7/misc-utils/whereis.c -@@ -323,14 +323,14 @@ - char dirbuf[1024]; - struct stat statbuf; - -- dd = index(dir, '*'); -+ dd = strchr(dir, '*'); - if (!dd) - goto noglob; - - l = strlen(dir); - if (l < sizeof(dirbuf)) { /* refuse excessively long names */ - strcpy (dirbuf, dir); -- d = index(dirbuf, '*'); -+ d = strchr(dirbuf, '*'); - *d = 0; - dirp = opendir(dirbuf); - if (dirp == NULL) -Index: util-linux-2.13-pre7/mount/mntent.c -=================================================================== ---- util-linux-2.13-pre7.orig/mount/mntent.c -+++ util-linux-2.13-pre7/mount/mntent.c -@@ -158,7 +158,7 @@ - return NULL; - - mfp->mntent_lineno++; -- s = index (buf, '\n'); -+ s = strchr (buf, '\n'); - if (s == NULL) { - /* Missing final newline? Otherwise extremely */ - /* long line - assume file was corrupted */ -@@ -166,7 +166,7 @@ - fprintf(stderr, _("[mntent]: warning: no final " - "newline at the end of %s\n"), - mfp->mntent_file); -- s = index (buf, 0); -+ s = strchr (buf, 0); - } else { - mfp->mntent_errs = 1; - goto err; -Index: util-linux-2.13-pre7/mount/mount.c -=================================================================== ---- util-linux-2.13-pre7.orig/mount/mount.c -+++ util-linux-2.13-pre7/mount/mount.c -@@ -488,11 +488,11 @@ - - /* Accept a comma-separated list of types, and try them one by one */ - /* A list like "nonfs,.." indicates types not to use */ -- if (*types && strncmp(*types, "no", 2) && index(*types,',')) { -+ if (*types && strncmp(*types, "no", 2) && strchr(*types,',')) { - char *t = strdup(*types); - char *p; - -- while((p = index(t,',')) != NULL) { -+ while((p = strchr(t,',')) != NULL) { - *p = 0; - args.type = *types = t; - if(do_mount_syscall (&args) == 0) -Index: util-linux-2.13-pre7/mount/mount_by_label.c -=================================================================== ---- util-linux-2.13-pre7.orig/mount/mount_by_label.c -+++ util-linux-2.13-pre7/mount/mount_by_label.c -@@ -213,7 +213,7 @@ - fseek(procpt, 0, SEEK_SET); - - while (fgets(line, sizeof(line), procpt)) { -- if (!index(line, '\n')) -+ if (!strchr(line, '\n')) - break; - - if (sscanf (line, " %d %d %d %[^\n ]", -Index: util-linux-2.13-pre7/mount/sundries.c -=================================================================== ---- util-linux-2.13-pre7.orig/mount/sundries.c -+++ util-linux-2.13-pre7/mount/sundries.c -@@ -138,7 +138,7 @@ - if (strncmp(p, type, len) == 0 && - (p[len] == 0 || p[len] == ',')) - return !no; -- p = index(p,','); -+ p = strchr(p,','); - if (!p) - break; - p++; -Index: util-linux-2.13-pre7/mount/umount.c -=================================================================== ---- util-linux-2.13-pre7.orig/mount/umount.c -+++ util-linux-2.13-pre7/mount/umount.c -@@ -332,7 +332,7 @@ - if (res < 0) - umnt_err2 = errno; - /* Do not complain about remote NFS mount points */ -- if (errno == ENOENT && index(spec, ':')) -+ if (errno == ENOENT && strchr(spec, ':')) - umnt_err2 = 0; - } - } -Index: util-linux-2.13-pre7/partx/partx.c -=================================================================== ---- util-linux-2.13-pre7.orig/partx/partx.c -+++ util-linux-2.13-pre7/partx/partx.c -@@ -130,7 +130,7 @@ - case 'n': - p = optarg; - lower = atoi(p); -- p = index(p, '-'); -+ p = strchr(p, '-'); - if (p) - upper = atoi(p+1); - else -Index: util-linux-2.13-pre7/text-utils/display.c -=================================================================== ---- util-linux-2.13-pre7.orig/text-utils/display.c -+++ util-linux-2.13-pre7/text-utils/display.c -@@ -163,7 +163,7 @@ - pr->cchar[0] = 's'; - pr->cchar[1] = 0; - for (p1 = pr->fmt; *p1 != '%'; ++p1); -- for (p2 = ++p1; *p1 && index(spec, *p1); ++p1); -+ for (p2 = ++p1; *p1 && strchr(spec, *p1); ++p1); - while ((*p2++ = *p1++) != 0) ; - } - -Index: util-linux-2.13-pre7/text-utils/parse.c -=================================================================== ---- util-linux-2.13-pre7.orig/text-utils/parse.c -+++ util-linux-2.13-pre7/text-utils/parse.c -@@ -64,7 +64,7 @@ - exit(1); - } - while (fgets(buf, sizeof(buf), fp)) { -- if ((p = index(buf, '\n')) == NULL) { -+ if ((p = strchr(buf, '\n')) == NULL) { - (void)fprintf(stderr, _("hexdump: line too long.\n")); - while ((ch = getchar()) != '\n' && ch != EOF); - continue; -@@ -171,7 +171,7 @@ - * skip any special chars -- save precision in - * case it's a %s format. - */ -- while (index(spec + 1, *++fmt)); -+ while (strchr(spec + 1, *++fmt)); - if (*fmt == '.' && isdigit((unsigned char)*++fmt)) { - prec = atoi(fmt); - while (isdigit((unsigned char)*++fmt)); -@@ -244,10 +244,10 @@ - if (fu->bcnt) { - sokay = USEBCNT; - /* skip to conversion character */ -- for (++p1; index(spec, *p1); ++p1); -+ for (++p1; strchr(spec, *p1); ++p1); - } else { - /* skip any special chars, field width */ -- while (index(spec + 1, *++p1)); -+ while (strchr(spec + 1, *++p1)); - if (*p1 == '.' && - isdigit((unsigned char)*++p1)) { - sokay = USEPREC; -Index: util-linux-2.13-pre7/fdisk/cfdisk.c -=================================================================== ---- util-linux-2.13-pre7.orig/fdisk/cfdisk.c -+++ util-linux-2.13-pre7/fdisk/cfdisk.c -@@ -348,7 +348,7 @@ - /* Some libc's have their own basename() */ - static char * - my_basename(char *devname) { -- char *s = rindex(devname, '/'); -+ char *s = strrchr(devname, '/'); - return s ? s+1 : devname; - } - -Index: util-linux-2.13-pre7/login-utils/wall.c -=================================================================== ---- util-linux-2.13-pre7.orig/login-utils/wall.c -+++ util-linux-2.13-pre7/login-utils/wall.c -@@ -87,7 +87,7 @@ - textdomain(PACKAGE); - - progname = argv[0]; -- p = rindex(progname, '/'); -+ p = strrchr(progname, '/'); - if (p) - progname = p+1; - diff --git a/package/util-linux/util-linux-umount2-fix.patch b/package/util-linux/util-linux-umount2-fix.patch deleted file mode 100644 index 14b6c34..0000000 --- a/package/util-linux/util-linux-umount2-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ -[PATCH] fix multiple definitions of umount2 issue - -Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> ---- - mount/umount.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: util-linux-2.13-pre7/mount/umount.c -=================================================================== ---- util-linux-2.13-pre7.orig/mount/umount.c -+++ util-linux-2.13-pre7/mount/umount.c -@@ -29,7 +29,7 @@ - #include "nfsmount.h" - #include <arpa/inet.h> - --#if defined(MNT_FORCE) && !defined(__sparc__) && !defined(__arm__) -+#if 1 - /* Interesting ... it seems libc knows about MNT_FORCE and presumably - about umount2 as well -- need not do anything */ - #else /* MNT_FORCE */ diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 445b4d1..f5245bd 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -3,100 +3,50 @@ # util-linux # ############################################################# -UTIL-LINUX_VERSION:=2.13-pre7 -UTIL-LINUX_SOURCE:=util-linux-$(UTIL-LINUX_VERSION).tar.bz2 -UTIL-LINUX_SITE:=$(BR2_KERNEL_MIRROR)/linux/utils/util-linux/testing -UTIL-LINUX_DIR:=$(BUILD_DIR)/util-linux-$(UTIL-LINUX_VERSION) -UTIL-LINUX_CAT:=$(BZCAT) -UTIL-LINUX_BINARY:=$(UTIL-LINUX_DIR)/misc-utils/chkdupexe -UTIL-LINUX_TARGET_BINARY:=$(TARGET_DIR)/usr/bin/chkdupexe -# schedutils isn't support for all archs -ifneq ($(BR2_i386)$(BR2_powerpc)$(BR2_x86_64)$(BR2_ia64)$(BR2_alpha),) -UTIL-LINUX_SCHED_UTILS:=--enable-schedutils -else -UTIL-LINUX_SCHED_UTILS:=--disable-schedutils -endif +UTIL_LINUX_VERSION = 2.18 +UTIL_LINUX_SOURCE = util-linux-ng-$(UTIL_LINUX_VERSION).tar.bz2 +UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION) +UTIL_LINUX_CONF_OPT = --disable-use-tty-group --disable-libblkid +UTIL_LINUX_AUTORECONF = YES -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -UTIL-LINUX_DEPENDENCIES += gettext libintl -UTIL-LINUX_MAKE_OPT = LIBS=-lintl +# build after busybox, we prefer fat versions while we're at it +ifeq ($(BR2_PACKAGE_BUSYBOX),y) +UTIL_LINUX_DEPENDENCIES += busybox endif -ifeq ($(BR2_PACKAGE_NCURSES),y) -UTIL-LINUX_DEPENDENCIES += ncurses +# LARGEFILE is necessary for mount and fsck so disable them +ifneq ($(BR2_LARGEFILE),y) +UTIL_LINUX_CONF_OPT += --disable-libmount --disable-mount --disable-fsck +else +# Use e2fsprogs libblkid & libuuid +UTIL_LINUX_CONF_OPT += --disable-libuuid +UTIL_LINUX_DEPENDENCIES += host-pkg-config e2fsprogs endif -$(DL_DIR)/$(UTIL-LINUX_SOURCE): - $(call DOWNLOAD,$(UTIL-LINUX_SITE),$(UTIL-LINUX_SOURCE)) - -$(UTIL-LINUX_DIR)/.unpacked: $(DL_DIR)/$(UTIL-LINUX_SOURCE) - $(UTIL-LINUX_CAT) $(DL_DIR)/$(UTIL-LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(UTIL-LINUX_DIR) package/util-linux/ util-linux\*.patch - touch $(UTIL-LINUX_DIR)/.unpacked - -$(UTIL-LINUX_DIR)/.configured: $(UTIL-LINUX_DIR)/.unpacked - (cd $(UTIL-LINUX_DIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ac_cv_lib_blkid_blkid_known_fstype=no \ - ./configure $(QUIET) \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --disable-use-tty-group \ - --prefix=/ \ - --exec-prefix=/ \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ - $(UTIL-LINUX_SCHED_UTILS) \ - $(DISABLE_NLS) \ - $(DISABLE_LARGEFILE) \ - ARCH=$(ARCH) \ - ) - touch $(UTIL-LINUX_DIR)/.configured - -$(UTIL-LINUX_BINARY): $(UTIL-LINUX_DIR)/.configured - $(MAKE) \ - -C $(UTIL-LINUX_DIR) \ - ARCH=$(ARCH) \ - CC="$(TARGET_CC)" \ - OPT="$(TARGET_CFLAGS)" \ - $(UTIL-LINUX_MAKE_OPT) \ - HAVE_SLANG="NO" - -$(UTIL-LINUX_TARGET_BINARY): $(UTIL-LINUX_BINARY) - $(MAKE) ARCH=$(ARCH) DESTDIR=$(TARGET_DIR) USE_TTY_GROUP=no -C $(UTIL-LINUX_DIR) install - rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/share/info \ - $(TARGET_DIR)/usr/share/man $(TARGET_DIR)/usr/share/doc - -#If both util-linux and busybox are selected, make certain util-linux -#wins the fight over who gets to have their utils actually installed -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -UTIL-LINUX_DEPENDENCIES := busybox $(UTIL-LINUX_DEPENDENCIES) +# schedutils aren't supported for all archs +ifneq ($(BR2_arm)$(BR2_i386)$(BR2_powerpc)$(BR2_x86_64),) +UTIL_LINUX_CONF_OPTS = --enable-schedutils endif -util-linux: $(UTIL-LINUX_DEPENDENCIES) $(UTIL-LINUX_TARGET_BINARY) - -util-linux-source: $(DL_DIR)/$(UTIL-LINUX_SOURCE) - -util-linux-clean: - #There is no working 'uninstall' target. Just skip it... - #$(MAKE) DESTDIR=$(TARGET_DIR) -C $(UTIL-LINUX_DIR) uninstall - -$(MAKE) -C $(UTIL-LINUX_DIR) clean +# cramfs tools are built if we have zlib +ifeq ($(BR2_PACKAGE_ZLIB),y) +UTIL_LINUX_DEPENDENCIES += zlib +endif -util-linux-dirclean: - rm -rf $(UTIL-LINUX_DIR) +ifneq ($(BR2_GCC_ENABLE_TLS),y) +UTIL_LINUX_CONF_OPT += --disable-tls +endif +ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) +UTIL_LINUX_DEPENDENCIES += gettext libintl +UTIL_LINUX_MAKE_OPT = LIBS=-lintl +endif -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_UTIL-LINUX),y) -TARGETS+=util-linux +ifeq ($(BR2_PACKAGE_NCURSES),y) +UTIL_LINUX_DEPENDENCIES += ncurses +else +UTIL_LINUX_CONF_OPT += --without-ncurses endif + +$(eval $(call AUTOTARGETS,package,util-linux)) -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 2/9] util-linux: convert to autotargets and bump to 2.18 2011-01-27 14:21 ` [Buildroot] [PATCH 2/9] util-linux: convert to autotargets and bump to 2.18 Gustavo Zacarias @ 2011-01-27 14:43 ` Thomas Petazzoni 2011-01-27 14:52 ` Gustavo Zacarias 0 siblings, 1 reply; 16+ messages in thread From: Thomas Petazzoni @ 2011-01-27 14:43 UTC (permalink / raw) To: buildroot On Thu, 27 Jan 2011 11:21:27 -0300 Gustavo Zacarias <gustavo@zacarias.com.ar> wrote: > Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> We had some patches on the list switching to util-linux-ng. Wouldn't this be a better choice ? Or maybe I misunderstood the status of util-linux vs. util-linux-ng ? Regards, Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 2/9] util-linux: convert to autotargets and bump to 2.18 2011-01-27 14:43 ` Thomas Petazzoni @ 2011-01-27 14:52 ` Gustavo Zacarias 0 siblings, 0 replies; 16+ messages in thread From: Gustavo Zacarias @ 2011-01-27 14:52 UTC (permalink / raw) To: buildroot On 01/27/11 11:43, Thomas Petazzoni wrote: > We had some patches on the list switching to util-linux-ng. Wouldn't > this be a better choice ? Or maybe I misunderstood the status of > util-linux vs. util-linux-ng ? > > Regards, > > Thomas It's util-linux-ng, i just keep the old package name :) Regards. ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 3/9] uclibc: add BSD endian conversions 2011-01-27 14:21 [Buildroot] [PATCH 1/9] e2fsprogs: bump to 1.41.14 and fixup Gustavo Zacarias 2011-01-27 14:21 ` [Buildroot] [PATCH 2/9] util-linux: convert to autotargets and bump to 2.18 Gustavo Zacarias @ 2011-01-27 14:21 ` Gustavo Zacarias 2011-01-31 20:02 ` Peter Korsgaard 2011-01-27 14:21 ` [Buildroot] [PATCH 4/9] uclibc: add SOCK_CLOEXEC and SOCK_NONBLOCK support Gustavo Zacarias ` (5 subsequent siblings) 7 siblings, 1 reply; 16+ messages in thread From: Gustavo Zacarias @ 2011-01-27 14:21 UTC (permalink / raw) To: buildroot Add BSD endian conversion routines. Required to use a modern udev. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- .../uClibc-0.9.31-add-bsd-endian-conversions.patch | 64 ++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) create mode 100644 toolchain/uClibc/uClibc-0.9.31-add-bsd-endian-conversions.patch diff --git a/toolchain/uClibc/uClibc-0.9.31-add-bsd-endian-conversions.patch b/toolchain/uClibc/uClibc-0.9.31-add-bsd-endian-conversions.patch new file mode 100644 index 0000000..652d7c9 --- /dev/null +++ b/toolchain/uClibc/uClibc-0.9.31-add-bsd-endian-conversions.patch @@ -0,0 +1,64 @@ +From c6d6237819037168a6923ac080e348e54615422c Mon Sep 17 00:00:00 2001 +From: Vladimir Zapolskiy <vzapolskiy@gmail.com> +Date: Tue, 1 Jun 2010 23:22:57 +0400 +Subject: [PATCH] endian.h: add BSD convertions between big/little-endian byte order + +This patch adds support for convertion of values between host and +big-/little-endian byte order. + +Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com> +Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> +--- + include/endian.h | 38 ++++++++++++++++++++++++++++++++++++++ + 1 files changed, 38 insertions(+), 0 deletions(-) + +diff --git a/include/endian.h b/include/endian.h +index 2f7bce1..0ba7384 100644 +--- a/include/endian.h ++++ b/include/endian.h +@@ -55,4 +55,42 @@ + # define __LONG_LONG_PAIR(HI, LO) HI, LO + #endif + ++ ++#ifdef __USE_BSD ++/* Conversion interfaces. */ ++# include <byteswap.h> ++ ++# if __BYTE_ORDER == __LITTLE_ENDIAN ++# define htobe16(x) __bswap_16 (x) ++# define htole16(x) (x) ++# define be16toh(x) __bswap_16 (x) ++# define le16toh(x) (x) ++ ++# define htobe32(x) __bswap_32 (x) ++# define htole32(x) (x) ++# define be32toh(x) __bswap_32 (x) ++# define le32toh(x) (x) ++ ++# define htobe64(x) __bswap_64 (x) ++# define htole64(x) (x) ++# define be64toh(x) __bswap_64 (x) ++# define le64toh(x) (x) ++# else ++# define htobe16(x) (x) ++# define htole16(x) __bswap_16 (x) ++# define be16toh(x) (x) ++# define le16toh(x) __bswap_16 (x) ++ ++# define htobe32(x) (x) ++# define htole32(x) __bswap_32 (x) ++# define be32toh(x) (x) ++# define le32toh(x) __bswap_32 (x) ++ ++# define htobe64(x) (x) ++# define htole64(x) __bswap_64 (x) ++# define be64toh(x) (x) ++# define le64toh(x) __bswap_64 (x) ++# endif ++#endif ++ + #endif /* endian.h */ +-- +1.7.3.4 + -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 3/9] uclibc: add BSD endian conversions 2011-01-27 14:21 ` [Buildroot] [PATCH 3/9] uclibc: add BSD endian conversions Gustavo Zacarias @ 2011-01-31 20:02 ` Peter Korsgaard 0 siblings, 0 replies; 16+ messages in thread From: Peter Korsgaard @ 2011-01-31 20:02 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Add BSD endian conversion routines. Gustavo> Required to use a modern udev. Committed with an extended commit message pointing out its upstream, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 4/9] uclibc: add SOCK_CLOEXEC and SOCK_NONBLOCK support 2011-01-27 14:21 [Buildroot] [PATCH 1/9] e2fsprogs: bump to 1.41.14 and fixup Gustavo Zacarias 2011-01-27 14:21 ` [Buildroot] [PATCH 2/9] util-linux: convert to autotargets and bump to 2.18 Gustavo Zacarias 2011-01-27 14:21 ` [Buildroot] [PATCH 3/9] uclibc: add BSD endian conversions Gustavo Zacarias @ 2011-01-27 14:21 ` Gustavo Zacarias 2011-01-27 14:21 ` [Buildroot] [PATCH 5/9] uclibc: add inotify_init1 syscall support Gustavo Zacarias ` (4 subsequent siblings) 7 siblings, 0 replies; 16+ messages in thread From: Gustavo Zacarias @ 2011-01-27 14:21 UTC (permalink / raw) To: buildroot Add SOCK_CLOEXEC and SOCK_NONBLOCK support to uclibc. Required to use a modern udev. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- .../uClibc/uClibc-0.9.31-add-sock-cloexec.patch | 43 ++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) create mode 100644 toolchain/uClibc/uClibc-0.9.31-add-sock-cloexec.patch diff --git a/toolchain/uClibc/uClibc-0.9.31-add-sock-cloexec.patch b/toolchain/uClibc/uClibc-0.9.31-add-sock-cloexec.patch new file mode 100644 index 0000000..a7089a9 --- /dev/null +++ b/toolchain/uClibc/uClibc-0.9.31-add-sock-cloexec.patch @@ -0,0 +1,43 @@ +From 83333e9c873e4eca6b2c945f7770b1f5373b0427 Mon Sep 17 00:00:00 2001 +From: Vladimir Zapolskiy <vzapolskiy@gmail.com> +Date: Tue, 1 Jun 2010 20:02:39 +0400 +Subject: [PATCH] bits/socket.h: add SOCK_CLOEXEC and SOCK_NONBLOCK support + +This patch adds support for SOCK_CLOEXEC and SOCK_NONBLOCK socket +descriptor flags, which are introduced since Linux 2.6.27 + +Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libc/sysdeps/linux/common/bits/socket.h | 12 +++++++++++- + 1 files changed, 11 insertions(+), 1 deletions(-) + +diff --git a/libc/sysdeps/linux/common/bits/socket.h b/libc/sysdeps/linux/common/bits/socket.h +index ac5a433..11f6e97 100644 +--- a/libc/sysdeps/linux/common/bits/socket.h ++++ b/libc/sysdeps/linux/common/bits/socket.h +@@ -53,10 +53,20 @@ enum __socket_type + SOCK_SEQPACKET = 5, /* Sequenced, reliable, connection-based, + datagrams of fixed maximum length. */ + #define SOCK_SEQPACKET SOCK_SEQPACKET +- SOCK_PACKET = 10 /* Linux specific way of getting packets ++ SOCK_PACKET = 10, /* Linux specific way of getting packets + at the dev level. For writing rarp and + other similar things on the user level. */ + #define SOCK_PACKET SOCK_PACKET ++ ++ /* Flags to be ORed into the type parameter of socket and socketpair and ++ used for the flags parameter of paccept. */ ++ ++ SOCK_CLOEXEC = 02000000, /* Atomically set close-on-exec flag for the ++ new descriptor(s). */ ++#define SOCK_CLOEXEC SOCK_CLOEXEC ++ SOCK_NONBLOCK = 04000 /* Atomically mark descriptor(s) as ++ non-blocking. */ ++#define SOCK_NONBLOCK SOCK_NONBLOCK + }; + + /* Protocol families. */ +-- +1.7.3.4 + -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 5/9] uclibc: add inotify_init1 syscall support 2011-01-27 14:21 [Buildroot] [PATCH 1/9] e2fsprogs: bump to 1.41.14 and fixup Gustavo Zacarias ` (2 preceding siblings ...) 2011-01-27 14:21 ` [Buildroot] [PATCH 4/9] uclibc: add SOCK_CLOEXEC and SOCK_NONBLOCK support Gustavo Zacarias @ 2011-01-27 14:21 ` Gustavo Zacarias 2011-01-27 14:21 ` [Buildroot] [PATCH 6/9] procps: convert to gentargets and bump to version 3.2.8 Gustavo Zacarias ` (3 subsequent siblings) 7 siblings, 0 replies; 16+ messages in thread From: Gustavo Zacarias @ 2011-01-27 14:21 UTC (permalink / raw) To: buildroot Add inotify_init1 system call support to uclibc. Required to use a modern udev. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- .../uClibc/uClibc-0.9.31-add-inotify-init1.patch | 64 ++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) create mode 100644 toolchain/uClibc/uClibc-0.9.31-add-inotify-init1.patch diff --git a/toolchain/uClibc/uClibc-0.9.31-add-inotify-init1.patch b/toolchain/uClibc/uClibc-0.9.31-add-inotify-init1.patch new file mode 100644 index 0000000..cbec426 --- /dev/null +++ b/toolchain/uClibc/uClibc-0.9.31-add-inotify-init1.patch @@ -0,0 +1,64 @@ +From a2e5630af426f85fdd8721b2820786d9bd2aa695 Mon Sep 17 00:00:00 2001 +From: Vladimir Zapolskiy <vzapolskiy@gmail.com> +Date: Tue, 1 Jun 2010 20:02:54 +0400 +Subject: [PATCH] inotify: add inotify_init1 system call support + +This patch introduces support for inotify_init1 system call, found +since Linux 2.6.27. + +Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libc/sysdeps/linux/common/inotify.c | 4 ++++ + libc/sysdeps/linux/common/sys/inotify.h | 13 +++++++++++++ + 2 files changed, 17 insertions(+), 0 deletions(-) + +diff --git a/libc/sysdeps/linux/common/inotify.c b/libc/sysdeps/linux/common/inotify.c +index e5a6120..e35f043 100644 +--- a/libc/sysdeps/linux/common/inotify.c ++++ b/libc/sysdeps/linux/common/inotify.c +@@ -15,6 +15,10 @@ + _syscall0(int, inotify_init) + #endif + ++#ifdef __NR_inotify_init1 ++_syscall1(int, inotify_init1, int, flags) ++#endif ++ + #ifdef __NR_inotify_add_watch + _syscall3(int, inotify_add_watch, int, fd, const char *, path, uint32_t, mask) + #endif +diff --git a/libc/sysdeps/linux/common/sys/inotify.h b/libc/sysdeps/linux/common/sys/inotify.h +index 0131db9..dc4e19d 100644 +--- a/libc/sysdeps/linux/common/sys/inotify.h ++++ b/libc/sysdeps/linux/common/sys/inotify.h +@@ -22,6 +22,16 @@ + #include <stdint.h> + + ++/* Flags for the parameter of inotify_init1. */ ++enum ++ { ++ IN_CLOEXEC = 02000000, ++#define IN_CLOEXEC IN_CLOEXEC ++ IN_NONBLOCK = 04000 ++#define IN_NONBLOCK IN_NONBLOCK ++ }; ++ ++ + /* Structure describing an inotify event. */ + struct inotify_event + { +@@ -79,6 +89,9 @@ __BEGIN_DECLS + /* Create and initialize inotify instance. */ + extern int inotify_init (void) __THROW; + ++/* Create and initialize inotify instance. */ ++extern int inotify_init1 (int __flags) __THROW; ++ + /* Add watch of object NAME to inotify instance FD. Notify about + events specified by MASK. */ + extern int inotify_add_watch (int __fd, const char *__name, uint32_t __mask) +-- +1.7.3.4 + -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 6/9] procps: convert to gentargets and bump to version 3.2.8 2011-01-27 14:21 [Buildroot] [PATCH 1/9] e2fsprogs: bump to 1.41.14 and fixup Gustavo Zacarias ` (3 preceding siblings ...) 2011-01-27 14:21 ` [Buildroot] [PATCH 5/9] uclibc: add inotify_init1 syscall support Gustavo Zacarias @ 2011-01-27 14:21 ` Gustavo Zacarias 2011-01-27 14:21 ` [Buildroot] [PATCH 7/9] libpng: bump to version 1.4.5 Gustavo Zacarias ` (2 subsequent siblings) 7 siblings, 0 replies; 16+ messages in thread From: Gustavo Zacarias @ 2011-01-27 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/procps/procps-make-3.82.patch | 19 ++++++++++ package/procps/procps.mk | 61 ++++++++++----------------------- 2 files changed, 37 insertions(+), 43 deletions(-) create mode 100644 package/procps/procps-make-3.82.patch diff --git a/package/procps/procps-make-3.82.patch b/package/procps/procps-make-3.82.patch new file mode 100644 index 0000000..a4d49eb --- /dev/null +++ b/package/procps/procps-make-3.82.patch @@ -0,0 +1,19 @@ +ps/module.mk depends on vars set up in proc/module.mk, so make sure we always +include the .mk files in the right order + +Patch from gentoo's portage tree, http://bugs.gentoo.org/show_bug.cgi?id=333299 + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> + +--- procps-3.2.8/Makefile ++++ procps-3.2.8/Makefile +@@ -174,7 +174,8 @@ + # want this rule first, use := on ALL, and ALL not filled in yet + all: do_all + +--include */module.mk ++-include proc/module.mk ++-include ps/module.mk + + do_all: $(ALL) + diff --git a/package/procps/procps.mk b/package/procps/procps.mk index 3add243..2cee119 100644 --- a/package/procps/procps.mk +++ b/package/procps/procps.mk @@ -3,51 +3,26 @@ # procps # ############################################################# -PROCPS_VERSION:=3.2.7 -PROCPS_SOURCE:=procps-$(PROCPS_VERSION).tar.gz -PROCPS_SITE:=http://procps.sourceforge.net/ -PROCPS_DIR:=$(BUILD_DIR)/procps-$(PROCPS_VERSION) -PROCPS_BINARY:=ps/ps -PROCPS_TARGET_BINARY:=usr/bin/vmstat -$(DL_DIR)/$(PROCPS_SOURCE): - $(call DOWNLOAD,$(PROCPS_SITE),$(PROCPS_SOURCE)) +PROCPS_VERSION = 3.2.8 +PROCPS_SITE = http://procps.sourceforge.net/ +PROCPS_DEPENDENCIES = ncurses -$(PROCPS_DIR)/.source: $(DL_DIR)/$(PROCPS_SOURCE) - $(ZCAT) $(DL_DIR)/$(PROCPS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(PROCPS_DIR) package/procps/ procps\*.patch - touch $(PROCPS_DIR)/.source - -$(PROCPS_DIR)/$(PROCPS_BINARY): $(PROCPS_DIR)/.source - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(PROCPS_DIR) - -$(TARGET_DIR)/$(PROCPS_TARGET_BINARY): $(PROCPS_DIR)/$(PROCPS_BINARY) - $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \ - install='install -D' -C $(PROCPS_DIR) lib64=/lib \ - ldconfig='/bin/true' install - rm -Rf $(TARGET_DIR)/usr/share/man - -procps: ncurses $(TARGET_DIR)/$(PROCPS_TARGET_BINARY) - -procps-source: $(DL_DIR)/$(PROCPS_SOURCE) +# build after busybox, we prefer fat versions while we're at it +ifeq ($(BR2_PACKAGE_BUSYBOX),y) +PROCPS_DEPENDENCIES += busybox +endif -procps-clean: - for bin in uptime tload free w \ - top vmstat watch skill \ - snice kill sysctl pmap \ - pgrep pkill slabtop; do \ - rm -f $(TARGET_DIR)/usr/bin/$${bin}; \ - done - rm -f $(TARGET_DIR)/lib/libproc* +define PROCPS_BUILD_CMDS + $(SED) "s/ --owner 0 --group 0//" $(@D)/Makefile + $(SED) "s/ ldconfig/echo/" $(@D)/Makefile + $(SED) "s/[$$][(]lib64[)]/lib/" $(@D)/Makefile + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LDFLAGS="$(TARGET_LDFLAGS)" \ + CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" +endef -procps-dirclean: - rm -rf $(PROCPS_DIR) +define PROCPS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install +endef -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_PROCPS),y) -TARGETS+=procps -endif +$(eval $(call GENTARGETS,package,procps)) -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 7/9] libpng: bump to version 1.4.5 2011-01-27 14:21 [Buildroot] [PATCH 1/9] e2fsprogs: bump to 1.41.14 and fixup Gustavo Zacarias ` (4 preceding siblings ...) 2011-01-27 14:21 ` [Buildroot] [PATCH 6/9] procps: convert to gentargets and bump to version 3.2.8 Gustavo Zacarias @ 2011-01-27 14:21 ` Gustavo Zacarias 2011-02-02 21:59 ` Peter Korsgaard 2011-01-27 14:21 ` [Buildroot] [PATCH 8/9] libcuefile: convert to cmaketargets infrastructure Gustavo Zacarias 2011-01-27 14:21 ` [Buildroot] [PATCH 9/9] cdrkit: drop host-cmake dependencies Gustavo Zacarias 7 siblings, 1 reply; 16+ messages in thread From: Gustavo Zacarias @ 2011-01-27 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/libpng/libpng.mk | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index 82b88da..699561b 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -3,11 +3,10 @@ # libpng (Portable Network Graphic library) # ############################################################# -LIBPNG_VERSION = 1.4.4 +LIBPNG_VERSION = 1.4.5 LIBPNG_SERIES = 14 LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2 -LIBPNG_LIBTOOL_PATCH = NO LIBPNG_INSTALL_STAGING = YES LIBPNG_DEPENDENCIES = host-pkg-config zlib -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 7/9] libpng: bump to version 1.4.5 2011-01-27 14:21 ` [Buildroot] [PATCH 7/9] libpng: bump to version 1.4.5 Gustavo Zacarias @ 2011-02-02 21:59 ` Peter Korsgaard 0 siblings, 0 replies; 16+ messages in thread From: Peter Korsgaard @ 2011-02-02 21:59 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 8/9] libcuefile: convert to cmaketargets infrastructure 2011-01-27 14:21 [Buildroot] [PATCH 1/9] e2fsprogs: bump to 1.41.14 and fixup Gustavo Zacarias ` (5 preceding siblings ...) 2011-01-27 14:21 ` [Buildroot] [PATCH 7/9] libpng: bump to version 1.4.5 Gustavo Zacarias @ 2011-01-27 14:21 ` Gustavo Zacarias 2011-01-27 14:42 ` Thomas Petazzoni 2011-01-27 14:21 ` [Buildroot] [PATCH 9/9] cdrkit: drop host-cmake dependencies Gustavo Zacarias 7 siblings, 1 reply; 16+ messages in thread From: Gustavo Zacarias @ 2011-01-27 14:21 UTC (permalink / raw) To: buildroot Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/multimedia/libcuefile/libcuefile.mk | 22 +--------------------- 1 files changed, 1 insertions(+), 21 deletions(-) diff --git a/package/multimedia/libcuefile/libcuefile.mk b/package/multimedia/libcuefile/libcuefile.mk index 934113b..b801185 100644 --- a/package/multimedia/libcuefile/libcuefile.mk +++ b/package/multimedia/libcuefile/libcuefile.mk @@ -7,28 +7,8 @@ LIBCUEFILE_VERSION = r453 LIBCUEFILE_SITE = http://files.musepack.net/source LIBCUEFILE_SOURCE = libcuefile_$(LIBCUEFILE_VERSION).tar.gz -LIBCUEFILE_DEPENDENCIES = host-cmake LIBCUEFILE_INSTALL_STAGING = YES -# CMake doesn't support having the --sysroot option directly in the -# compiler path, so move this option to the CFLAGS/CXXFLAGS variables. -# It also gets confused by ccache, so don't use ccache here. -LIBCUEFILE_TARGET_CC = $(filter-out --sysroot=%,$(TARGET_CC_NOCCACHE)) -LIBCUEFILE_TARGET_CFLAGS = $(filter --sysroot=%,$(TARGET_CC)) $(TARGET_CFLAGS) - -define LIBCUEFILE_CONFIGURE_CMDS - (cd $(@D) ; \ - $(HOST_DIR)/usr/bin/cmake . \ - -DCMAKE_C_COMPILER:FILEPATH="$(LIBCUEFILE_TARGET_CC)" \ - -DCMAKE_C_FLAGS:STRING="$(LIBCUEFILE_TARGET_CFLAGS)" \ - -DCMAKE_INSTALL_PREFIX:PATH="/usr" \ - ) -endef - -define LIBCUEFILE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - define LIBCUEFILE_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" install cp -r $(@D)/include $(STAGING_DIR)/usr @@ -39,4 +19,4 @@ define LIBCUEFILE_INSTALL_TARGET_CMDS cp -r $(@D)/include $(TARGET_DIR)/usr endef -$(eval $(call GENTARGETS,package/multimedia,libcuefile)) +$(eval $(call CMAKETARGETS,package/multimedia,libcuefile)) -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 8/9] libcuefile: convert to cmaketargets infrastructure 2011-01-27 14:21 ` [Buildroot] [PATCH 8/9] libcuefile: convert to cmaketargets infrastructure Gustavo Zacarias @ 2011-01-27 14:42 ` Thomas Petazzoni 2011-01-27 15:03 ` Gustavo Zacarias 0 siblings, 1 reply; 16+ messages in thread From: Thomas Petazzoni @ 2011-01-27 14:42 UTC (permalink / raw) To: buildroot On Thu, 27 Jan 2011 11:21:33 -0300 Gustavo Zacarias <gustavo@zacarias.com.ar> wrote: > define LIBCUEFILE_INSTALL_STAGING_CMDS > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" install > cp -r $(@D)/include $(STAGING_DIR)/usr > @@ -39,4 +19,4 @@ define LIBCUEFILE_INSTALL_TARGET_CMDS > cp -r $(@D)/include $(TARGET_DIR)/usr > endef I would prefer to let the infrastructure do the target/staging installation, and use the post-staging-install and post-target-install hooks to do the headers copy trick. Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 8/9] libcuefile: convert to cmaketargets infrastructure 2011-01-27 14:42 ` Thomas Petazzoni @ 2011-01-27 15:03 ` Gustavo Zacarias 0 siblings, 0 replies; 16+ messages in thread From: Gustavo Zacarias @ 2011-01-27 15:03 UTC (permalink / raw) To: buildroot On 01/27/11 11:42, Thomas Petazzoni wrote: > I would prefer to let the infrastructure do the target/staging > installation, and use the post-staging-install and post-target-install > hooks to do the headers copy trick. > > Thomas Fair enough, sent PATCHv2. ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 9/9] cdrkit: drop host-cmake dependencies 2011-01-27 14:21 [Buildroot] [PATCH 1/9] e2fsprogs: bump to 1.41.14 and fixup Gustavo Zacarias ` (6 preceding siblings ...) 2011-01-27 14:21 ` [Buildroot] [PATCH 8/9] libcuefile: convert to cmaketargets infrastructure Gustavo Zacarias @ 2011-01-27 14:21 ` Gustavo Zacarias 2011-02-02 22:00 ` Peter Korsgaard 7 siblings, 1 reply; 16+ messages in thread From: Gustavo Zacarias @ 2011-01-27 14:21 UTC (permalink / raw) To: buildroot Now that it's been converted to cmaketargets it doesn't need the host-cmake dependencies since this are fulfilled in the infrastructure. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/cdrkit/cdrkit.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cdrkit/cdrkit.mk b/package/cdrkit/cdrkit.mk index ea7f65e..a57a8fd 100644 --- a/package/cdrkit/cdrkit.mk +++ b/package/cdrkit/cdrkit.mk @@ -2,8 +2,8 @@ CDRKIT_VERSION=1.1.10 CDRKIT_SOURCE=cdrkit-$(CDRKIT_VERSION).tar.gz CDRKIT_SITE=http://www.cdrkit.org/releases/ -CDRKIT_DEPENDENCIES=libcap bzip2 host-cmake zlib -HOST_CDRKIT_DEPENDENCIES=host-libcap host-cmake host-bzip2 host-zlib +CDRKIT_DEPENDENCIES=libcap bzip2 zlib +HOST_CDRKIT_DEPENDENCIES=host-libcap host-bzip2 host-zlib ifeq ($(BR2_ENDIAN),"BIG") CMAKE_ENDIAN_OPT=-DBITFIELDS_HTOL=1 -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 9/9] cdrkit: drop host-cmake dependencies 2011-01-27 14:21 ` [Buildroot] [PATCH 9/9] cdrkit: drop host-cmake dependencies Gustavo Zacarias @ 2011-02-02 22:00 ` Peter Korsgaard 0 siblings, 0 replies; 16+ messages in thread From: Peter Korsgaard @ 2011-02-02 22:00 UTC (permalink / raw) To: buildroot >>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> Now that it's been converted to cmaketargets it doesn't need Gustavo> the host-cmake dependencies since this are fulfilled in the Gustavo> infrastructure. Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2011-02-02 22:00 UTC | newest] Thread overview: 16+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-01-27 14:21 [Buildroot] [PATCH 1/9] e2fsprogs: bump to 1.41.14 and fixup Gustavo Zacarias 2011-01-27 14:21 ` [Buildroot] [PATCH 2/9] util-linux: convert to autotargets and bump to 2.18 Gustavo Zacarias 2011-01-27 14:43 ` Thomas Petazzoni 2011-01-27 14:52 ` Gustavo Zacarias 2011-01-27 14:21 ` [Buildroot] [PATCH 3/9] uclibc: add BSD endian conversions Gustavo Zacarias 2011-01-31 20:02 ` Peter Korsgaard 2011-01-27 14:21 ` [Buildroot] [PATCH 4/9] uclibc: add SOCK_CLOEXEC and SOCK_NONBLOCK support Gustavo Zacarias 2011-01-27 14:21 ` [Buildroot] [PATCH 5/9] uclibc: add inotify_init1 syscall support Gustavo Zacarias 2011-01-27 14:21 ` [Buildroot] [PATCH 6/9] procps: convert to gentargets and bump to version 3.2.8 Gustavo Zacarias 2011-01-27 14:21 ` [Buildroot] [PATCH 7/9] libpng: bump to version 1.4.5 Gustavo Zacarias 2011-02-02 21:59 ` Peter Korsgaard 2011-01-27 14:21 ` [Buildroot] [PATCH 8/9] libcuefile: convert to cmaketargets infrastructure Gustavo Zacarias 2011-01-27 14:42 ` Thomas Petazzoni 2011-01-27 15:03 ` Gustavo Zacarias 2011-01-27 14:21 ` [Buildroot] [PATCH 9/9] cdrkit: drop host-cmake dependencies Gustavo Zacarias 2011-02-02 22:00 ` Peter Korsgaard
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox