Revision: 5515 Author: pebender Date: Fri Sep 18 14:29:36 2009 Log: - Updated busybox patches.
http://code.google.com/p/minimyth/source/detail?r=5515 Added: /trunk/gar-minimyth/script/utils/busybox/files/busybox-1.15.1-dd.patch Modified: /trunk/gar-minimyth/script/utils/busybox/Makefile /trunk/gar-minimyth/script/utils/busybox/checksums ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/utils/busybox/files/busybox-1.15.1-dd.patch Fri Sep 18 14:29:36 2009 @@ -0,0 +1,35 @@ +diff -urpN busybox-1.15.1/coreutils/dd.c busybox-1.15.1-dd/coreutils/dd.c +--- busybox-1.15.1/coreutils/dd.c 2009-09-12 17:55:58.000000000 +0200 ++++ busybox-1.15.1-dd/coreutils/dd.c 2009-09-18 20:48:22.000000000 +0200 +@@ -286,25 +286,26 @@ int dd_main(int argc UNUSED_PARAM, char + } + + while (!(flags & FLAG_COUNT) || (G.in_full + G.in_part != count)) { +- if (flags & FLAG_NOERROR) /* Pre-zero the buffer if conv=noerror */ +- memset(ibuf, 0, ibs); + n = safe_read(ifd, ibuf, ibs); + if (n == 0) + break; + if (n < 0) { ++ /* "Bad block" */ + if (!(flags & FLAG_NOERROR)) + goto die_infile; +- n = ibs; + bb_simple_perror_msg(infile); +- /* GNU dd with conv=noerror skips over "bad blocks" */ ++ /* GNU dd with conv=noerror skips over bad blocks */ + xlseek(ifd, ibs, SEEK_CUR); ++ /* conv=noerror,sync writes NULs, ++ * conv=noerror just ignores input bad blocks */ ++ n = 0; + } + if ((size_t)n == ibs) + G.in_full++; + else { + G.in_part++; + if (flags & FLAG_SYNC) { +- memset(ibuf + n, '\0', ibs - n); ++ memset(ibuf + n, 0, ibs - n); + n = ibs; + } + } ======================================= --- /trunk/gar-minimyth/script/utils/busybox/Makefile Thu Sep 17 20:27:20 2009 +++ /trunk/gar-minimyth/script/utils/busybox/Makefile Fri Sep 18 14:29:36 2009 @@ -5,7 +5,8 @@ CONFIGFILE = $(DISTNAME).config DISTFILES = $(DISTNAME).tar.bz2 $(CONFIGFILE) PATCHFILES = \ - $(DISTNAME)-ash.patch + $(DISTNAME)-ash.patch \ + $(DISTNAME)-dd.patch PATCHFILES += $(DISTNAME)-dhcp_options.patch $(DISTNAME)-dhcp_timezone.patch $(DISTNAME)-tftp_timeout.patch LICENSE = GPL2 ======================================= --- /trunk/gar-minimyth/script/utils/busybox/checksums Thu Sep 17 20:27:20 2009 +++ /trunk/gar-minimyth/script/utils/busybox/checksums Fri Sep 18 14:29:36 2009 @@ -1,5 +1,6 @@ e67a98eef14212abfc265092e4683fbe download/busybox-1.15.1.tar.bz2 1371eaded98dbde44df218872c56dac2 download/busybox-1.15.1-ash.patch +51cc3dac2c8acacc767299e1f82cf189 download/busybox-1.15.1-dd.patch 1ab7ad05ac962a336a33cc7fb6cffdb5 download/busybox-1.15.1-dhcp_options.patch 35c40e9bc0bba5ff265ba47aae005f6a download/busybox-1.15.1-dhcp_timezone.patch 0e15defcae4991ccfc06ee2216d63473 download/busybox-1.15.1-tftp_timeout.patch --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en -~----------~----~----~----~------~----~------~--~---
