From 8f5add1754284c4e0f6162797b20b5d08b2e2882 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 31 Oct 2010 19:51:33 +0100 Subject: rework installation scripts for block devices Avoid sfdisk, parted and chroot to be more portable. Compile Host grub in target/tools, only used for ibmx40 target right now. Add pt - partition table manager from OpenWrt with some additions and portability fixes. Cfgfs support missing, coming soon. --- tools/adk/Makefile | 6 +- tools/adk/pt.c | 256 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 261 insertions(+), 1 deletion(-) create mode 100644 tools/adk/pt.c (limited to 'tools') diff --git a/tools/adk/Makefile b/tools/adk/Makefile index 3f2048e68..fd1d0e2c0 100644 --- a/tools/adk/Makefile +++ b/tools/adk/Makefile @@ -9,6 +9,10 @@ ${TOPDIR}/bin/tools/depmaker: ${TOPDIR}/bin/tools/pkgrebuild: $(HOSTCC) -o $(TOPDIR)/bin/tools/pkgrebuild pkgrebuild.c strmap.c -install: ${TOPDIR}/bin/tools/depmaker ${TOPDIR}/bin/tools/pkgrebuild +${TOPDIR}/bin/tools/pt: + $(HOSTCC) -o $(TOPDIR)/bin/tools/pt pt.c + +install: ${TOPDIR}/bin/tools/depmaker ${TOPDIR}/bin/tools/pkgrebuild \ + $(TOPDIR)/bin/tools/pt include $(TOPDIR)/mk/tools.mk diff --git a/tools/adk/pt.c b/tools/adk/pt.c new file mode 100644 index 000000000..e98550b31 --- /dev/null +++ b/tools/adk/pt.c @@ -0,0 +1,256 @@ +/* + * pt - partition table utility + * Copyright (C) 2010 by Waldemar Brodkorb + * + * just adds some required code to ptgen - partition table generator + * Copyright (C) 2006 by Felix Fietkau + * + * uses parts of afdisk + * Copyright (C) 2002 by David Roetzel + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#if defined(__linux__) +#include +#endif + +#if defined(__APPLE__) +#include +#define BLKGETSIZE DKIOCGETBLOCKCOUNT +#endif + +#define bswap16(x) ( \ + ((((x) )&(unsigned int)0xff)<< 8) \ + |((((x)>> 8)&(unsigned int)0xff) ) \ +) + +#if __BYTE_ORDER == __BIG_ENDIAN +#define cpu_to_le16(x) bswap16(x) +#elif __BYTE_ORDER == __LITTLE_ENDIAN +#define cpu_to_le16(x) (x) +#else +#error unknown endianness! +#endif + +/* Partition table entry */ +struct pte { + unsigned char active; + unsigned char chs_start[3]; + unsigned char type; + unsigned char chs_end[3]; + unsigned int start; + unsigned int length; +}; + +struct partinfo { + unsigned long size; + int type; +}; + +int verbose = 0; +int active = 1; +int heads = -1; +int sectors = -1; +struct partinfo parts[4]; +char *filename = NULL; + +/* + * get the sector size of the block device + * + * print the sector size + */ + +static void getmaxsize(char *device) { + int fd; + unsigned long maxsectors=0; + + fd = open(device, O_RDONLY); + ioctl(fd, BLKGETSIZE, &maxsectors); + printf("%lu\n", maxsectors); + close(fd); +} + +/* + * parse the size argument, which is either + * a simple number (K assumed) or + * K, M or G + * + * returns the size in KByte + */ +static long to_kbytes(const char *string) { + int exp = 0; + long result; + char *end; + + result = strtoul(string, &end, 0); + switch (tolower(*end)) { + case 'k' : + case '\0' : exp = 0; break; + case 'm' : exp = 1; break; + case 'g' : exp = 2; break; + default: return 0; + } + + if (*end) + end++; + + if (*end) { + fprintf(stderr, "garbage after end of number\n"); + return 0; + } + + /* result: number + 1024^(exp) */ + return result * ((2 << ((10 * exp) - 1)) ?: 1); +} + +/* convert the sector number into a CHS value for the partition table */ +static void to_chs(long sect, unsigned char chs[3]) { + int c,h,s; + + s = (sect % sectors) + 1; + sect = sect / sectors; + h = sect % heads; + sect = sect / heads; + c = sect; + + chs[0] = h; + chs[1] = s | ((c >> 2) & 0xC0); + chs[2] = c & 0xFF; + + return; +} + +/* round the sector number up to the next cylinder */ +static inline unsigned long round_to_cyl(long sect) { + int cyl_size = heads * sectors; + + return sect + cyl_size - (sect % cyl_size); +} + +/* check the partition sizes and write the partition table */ +static int gen_ptable(int nr) +{ + struct pte pte[4]; + unsigned long sect = 0; + unsigned int start, len; + int i, fd, ret = -1; + + memset(pte, 0, sizeof(struct pte) * 4); + for (i = 0; i < nr; i++) { + if (!parts[i].size) { + fprintf(stderr, "Invalid size in partition %d!\n", i); + return -1; + } + pte[i].active = ((i + 1) == active) ? 0x80 : 0; + pte[i].type = parts[i].type; + pte[i].start = cpu_to_le16(start = sect + sectors); + sect = round_to_cyl(start + parts[i].size * 2); + pte[i].length = cpu_to_le16(len = sect - start); + to_chs(start, pte[i].chs_start); + to_chs(start + len - 1, pte[i].chs_end); + if (verbose) + fprintf(stderr, "Partition %d: start=%u, end=%u, size=%u\n", i, start * 512, (start + len) * 512, len * 512); + } + + if ((fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0644)) < 0) { + fprintf(stderr, "Can't open output file '%s'\n",filename); + return -1; + } + + lseek(fd, 446, SEEK_SET); + if (write(fd, pte, sizeof(struct pte) * 4) != sizeof(struct pte) * 4) { + fprintf(stderr, "write failed.\n"); + goto fail; + } + lseek(fd, 510, SEEK_SET); + if (write(fd, "\x55\xaa", 2) != 2) { + fprintf(stderr, "write failed.\n"); + goto fail; + } + + ret = 0; +fail: + close(fd); + return ret; +} + +static void usage(char *prog) +{ + fprintf(stderr, "Usage: %s [-v] -h -s -o [-a 0..4] [[-t ] -p ...] \n", prog); + fprintf(stderr, "Usage: %s -g \n", prog); + exit(1); +} + +int main (int argc, char **argv) +{ + char type = 0x83; + int ch; + int part = 0; + + while ((ch = getopt(argc, argv, "h:s:p:a:t:o:vg:")) != -1) { + switch (ch) { + case 'o': + filename = optarg; + break; + case 'v': + verbose++; + break; + case 'h': + heads = (int) strtoul(optarg, NULL, 0); + break; + case 's': + sectors = (int) strtoul(optarg, NULL, 0); + break; + case 'p': + if (part > 3) { + fprintf(stderr, "Too many partitions\n"); + exit(1); + } + parts[part].size = to_kbytes(optarg); + parts[part++].type = type; + break; + case 't': + type = (char) strtoul(optarg, NULL, 16); + break; + case 'a': + active = (int) strtoul(optarg, NULL, 0); + if ((active < 0) || (active > 4)) + active = 0; + break; + case 'g': + getmaxsize(optarg); + exit(0); + case '?': + default: + usage(argv[0]); + } + } + argc -= optind; + if (argc || (heads <= 0) || (sectors <= 0) || !filename) + usage(argv[0]); + + return gen_ptable(part); +} -- cgit v1.2.3