From 2a3119efb1277631bc8df9ebaa5cc2196701a7cf Mon Sep 17 00:00:00 2001 From: Herb Kuta Date: Mon, 9 Dec 2013 18:10:55 +0100 Subject: makedevs: Add trace option and fix permissions on files if they already exist * update version to 1.0.1 (From OE-Core rev: ce460dd1b9c137b00d1142801b133c083ce55e74) Signed-off-by: Herb Kuta Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- .../makedevs/makedevs-1.0.0/COPYING.patch | 346 ------------ .../makedevs/makedevs-1.0.0/makedevs.c | 537 ------------------- .../makedevs/makedevs/COPYING.patch | 346 ++++++++++++ meta/recipes-devtools/makedevs/makedevs/makedevs.c | 589 +++++++++++++++++++++ meta/recipes-devtools/makedevs/makedevs_1.0.0.bb | 29 - meta/recipes-devtools/makedevs/makedevs_1.0.1.bb | 28 + 6 files changed, 963 insertions(+), 912 deletions(-) delete mode 100644 meta/recipes-devtools/makedevs/makedevs-1.0.0/COPYING.patch delete mode 100644 meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c create mode 100644 meta/recipes-devtools/makedevs/makedevs/COPYING.patch create mode 100644 meta/recipes-devtools/makedevs/makedevs/makedevs.c delete mode 100644 meta/recipes-devtools/makedevs/makedevs_1.0.0.bb create mode 100644 meta/recipes-devtools/makedevs/makedevs_1.0.1.bb diff --git a/meta/recipes-devtools/makedevs/makedevs-1.0.0/COPYING.patch b/meta/recipes-devtools/makedevs/makedevs-1.0.0/COPYING.patch deleted file mode 100644 index 3a8902b97a..0000000000 --- a/meta/recipes-devtools/makedevs/makedevs-1.0.0/COPYING.patch +++ /dev/null @@ -1,346 +0,0 @@ -Upstream-Status: Inappropriate [licensing] - -diff -ruN makedevs-1.0.0-orig/COPYING makedevs-1.0.0/COPYING ---- makedevs-1.0.0-orig/COPYING 1970-01-01 08:00:00.000000000 +0800 -+++ makedevs-1.0.0/COPYING 2010-12-09 16:42:20.274984665 +0800 -@@ -0,0 +1,340 @@ -+ GNU GENERAL PUBLIC LICENSE -+ Version 2, June 1991 -+ -+ Copyright (C) 1989, 1991 Free Software Foundation, Inc. -+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ Everyone is permitted to copy and distribute verbatim copies -+ of this license document, but changing it is not allowed. -+ -+ Preamble -+ -+ The licenses for most software are designed to take away your -+freedom to share and change it. By contrast, the GNU General Public -+License is intended to guarantee your freedom to share and change free -+software--to make sure the software is free for all its users. This -+General Public License applies to most of the Free Software -+Foundation's software and to any other program whose authors commit to -+using it. (Some other Free Software Foundation software is covered by -+the GNU Library General Public License instead.) You can apply it to -+your programs, too. -+ -+ When we speak of free software, we are referring to freedom, not -+price. Our General Public Licenses are designed to make sure that you -+have the freedom to distribute copies of free software (and charge for -+this service if you wish), that you receive source code or can get it -+if you want it, that you can change the software or use pieces of it -+in new free programs; and that you know you can do these things. -+ -+ To protect your rights, we need to make restrictions that forbid -+anyone to deny you these rights or to ask you to surrender the rights. -+These restrictions translate to certain responsibilities for you if you -+distribute copies of the software, or if you modify it. -+ -+ For example, if you distribute copies of such a program, whether -+gratis or for a fee, you must give the recipients all the rights that -+you have. You must make sure that they, too, receive or can get the -+source code. And you must show them these terms so they know their -+rights. -+ -+ We protect your rights with two steps: (1) copyright the software, and -+(2) offer you this license which gives you legal permission to copy, -+distribute and/or modify the software. -+ -+ Also, for each author's protection and ours, we want to make certain -+that everyone understands that there is no warranty for this free -+software. If the software is modified by someone else and passed on, we -+want its recipients to know that what they have is not the original, so -+that any problems introduced by others will not reflect on the original -+authors' reputations. -+ -+ Finally, any free program is threatened constantly by software -+patents. We wish to avoid the danger that redistributors of a free -+program will individually obtain patent licenses, in effect making the -+program proprietary. To prevent this, we have made it clear that any -+patent must be licensed for everyone's free use or not licensed at all. -+ -+ The precise terms and conditions for copying, distribution and -+modification follow. -+ -+ GNU GENERAL PUBLIC LICENSE -+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -+ -+ 0. This License applies to any program or other work which contains -+a notice placed by the copyright holder saying it may be distributed -+under the terms of this General Public License. The "Program", below, -+refers to any such program or work, and a "work based on the Program" -+means either the Program or any derivative work under copyright law: -+that is to say, a work containing the Program or a portion of it, -+either verbatim or with modifications and/or translated into another -+language. (Hereinafter, translation is included without limitation in -+the term "modification".) Each licensee is addressed as "you". -+ -+Activities other than copying, distribution and modification are not -+covered by this License; they are outside its scope. The act of -+running the Program is not restricted, and the output from the Program -+is covered only if its contents constitute a work based on the -+Program (independent of having been made by running the Program). -+Whether that is true depends on what the Program does. -+ -+ 1. You may copy and distribute verbatim copies of the Program's -+source code as you receive it, in any medium, provided that you -+conspicuously and appropriately publish on each copy an appropriate -+copyright notice and disclaimer of warranty; keep intact all the -+notices that refer to this License and to the absence of any warranty; -+and give any other recipients of the Program a copy of this License -+along with the Program. -+ -+You may charge a fee for the physical act of transferring a copy, and -+you may at your option offer warranty protection in exchange for a fee. -+ -+ 2. You may modify your copy or copies of the Program or any portion -+of it, thus forming a work based on the Program, and copy and -+distribute such modifications or work under the terms of Section 1 -+above, provided that you also meet all of these conditions: -+ -+ a) You must cause the modified files to carry prominent notices -+ stating that you changed the files and the date of any change. -+ -+ b) You must cause any work that you distribute or publish, that in -+ whole or in part contains or is derived from the Program or any -+ part thereof, to be licensed as a whole at no charge to all third -+ parties under the terms of this License. -+ -+ c) If the modified program normally reads commands interactively -+ when run, you must cause it, when started running for such -+ interactive use in the most ordinary way, to print or display an -+ announcement including an appropriate copyright notice and a -+ notice that there is no warranty (or else, saying that you provide -+ a warranty) and that users may redistribute the program under -+ these conditions, and telling the user how to view a copy of this -+ License. (Exception: if the Program itself is interactive but -+ does not normally print such an announcement, your work based on -+ the Program is not required to print an announcement.) -+ -+These requirements apply to the modified work as a whole. If -+identifiable sections of that work are not derived from the Program, -+and can be reasonably considered independent and separate works in -+themselves, then this License, and its terms, do not apply to those -+sections when you distribute them as separate works. But when you -+distribute the same sections as part of a whole which is a work based -+on the Program, the distribution of the whole must be on the terms of -+this License, whose permissions for other licensees extend to the -+entire whole, and thus to each and every part regardless of who wrote it. -+ -+Thus, it is not the intent of this section to claim rights or contest -+your rights to work written entirely by you; rather, the intent is to -+exercise the right to control the distribution of derivative or -+collective works based on the Program. -+ -+In addition, mere aggregation of another work not based on the Program -+with the Program (or with a work based on the Program) on a volume of -+a storage or distribution medium does not bring the other work under -+the scope of this License. -+ -+ 3. You may copy and distribute the Program (or a work based on it, -+under Section 2) in object code or executable form under the terms of -+Sections 1 and 2 above provided that you also do one of the following: -+ -+ a) Accompany it with the complete corresponding machine-readable -+ source code, which must be distributed under the terms of Sections -+ 1 and 2 above on a medium customarily used for software interchange; or, -+ -+ b) Accompany it with a written offer, valid for at least three -+ years, to give any third party, for a charge no more than your -+ cost of physically performing source distribution, a complete -+ machine-readable copy of the corresponding source code, to be -+ distributed under the terms of Sections 1 and 2 above on a medium -+ customarily used for software interchange; or, -+ -+ c) Accompany it with the information you received as to the offer -+ to distribute corresponding source code. (This alternative is -+ allowed only for noncommercial distribution and only if you -+ received the program in object code or executable form with such -+ an offer, in accord with Subsection b above.) -+ -+The source code for a work means the preferred form of the work for -+making modifications to it. For an executable work, complete source -+code means all the source code for all modules it contains, plus any -+associated interface definition files, plus the scripts used to -+control compilation and installation of the executable. However, as a -+special exception, the source code distributed need not include -+anything that is normally distributed (in either source or binary -+form) with the major components (compiler, kernel, and so on) of the -+operating system on which the executable runs, unless that component -+itself accompanies the executable. -+ -+If distribution of executable or object code is made by offering -+access to copy from a designated place, then offering equivalent -+access to copy the source code from the same place counts as -+distribution of the source code, even though third parties are not -+compelled to copy the source along with the object code. -+ -+ 4. You may not copy, modify, sublicense, or distribute the Program -+except as expressly provided under this License. Any attempt -+otherwise to copy, modify, sublicense or distribute the Program is -+void, and will automatically terminate your rights under this License. -+However, parties who have received copies, or rights, from you under -+this License will not have their licenses terminated so long as such -+parties remain in full compliance. -+ -+ 5. You are not required to accept this License, since you have not -+signed it. However, nothing else grants you permission to modify or -+distribute the Program or its derivative works. These actions are -+prohibited by law if you do not accept this License. Therefore, by -+modifying or distributing the Program (or any work based on the -+Program), you indicate your acceptance of this License to do so, and -+all its terms and conditions for copying, distributing or modifying -+the Program or works based on it. -+ -+ 6. Each time you redistribute the Program (or any work based on the -+Program), the recipient automatically receives a license from the -+original licensor to copy, distribute or modify the Program subject to -+these terms and conditions. You may not impose any further -+restrictions on the recipients' exercise of the rights granted herein. -+You are not responsible for enforcing compliance by third parties to -+this License. -+ -+ 7. If, as a consequence of a court judgment or allegation of patent -+infringement or for any other reason (not limited to patent issues), -+conditions are imposed on you (whether by court order, agreement or -+otherwise) that contradict the conditions of this License, they do not -+excuse you from the conditions of this License. If you cannot -+distribute so as to satisfy simultaneously your obligations under this -+License and any other pertinent obligations, then as a consequence you -+may not distribute the Program at all. For example, if a patent -+license would not permit royalty-free redistribution of the Program by -+all those who receive copies directly or indirectly through you, then -+the only way you could satisfy both it and this License would be to -+refrain entirely from distribution of the Program. -+ -+If any portion of this section is held invalid or unenforceable under -+any particular circumstance, the balance of the section is intended to -+apply and the section as a whole is intended to apply in other -+circumstances. -+ -+It is not the purpose of this section to induce you to infringe any -+patents or other property right claims or to contest validity of any -+such claims; this section has the sole purpose of protecting the -+integrity of the free software distribution system, which is -+implemented by public license practices. Many people have made -+generous contributions to the wide range of software distributed -+through that system in reliance on consistent application of that -+system; it is up to the author/donor to decide if he or she is willing -+to distribute software through any other system and a licensee cannot -+impose that choice. -+ -+This section is intended to make thoroughly clear what is believed to -+be a consequence of the rest of this License. -+ -+ 8. If the distribution and/or use of the Program is restricted in -+certain countries either by patents or by copyrighted interfaces, the -+original copyright holder who places the Program under this License -+may add an explicit geographical distribution limitation excluding -+those countries, so that distribution is permitted only in or among -+countries not thus excluded. In such case, this License incorporates -+the limitation as if written in the body of this License. -+ -+ 9. The Free Software Foundation may publish revised and/or new versions -+of the General Public License from time to time. Such new versions will -+be similar in spirit to the present version, but may differ in detail to -+address new problems or concerns. -+ -+Each version is given a distinguishing version number. If the Program -+specifies a version number of this License which applies to it and "any -+later version", you have the option of following the terms and conditions -+either of that version or of any later version published by the Free -+Software Foundation. If the Program does not specify a version number of -+this License, you may choose any version ever published by the Free Software -+Foundation. -+ -+ 10. If you wish to incorporate parts of the Program into other free -+programs whose distribution conditions are different, write to the author -+to ask for permission. For software which is copyrighted by the Free -+Software Foundation, write to the Free Software Foundation; we sometimes -+make exceptions for this. Our decision will be guided by the two goals -+of preserving the free status of all derivatives of our free software and -+of promoting the sharing and reuse of software generally. -+ -+ NO WARRANTY -+ -+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -+REPAIR OR CORRECTION. -+ -+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -+POSSIBILITY OF SUCH DAMAGES. -+ -+ END OF TERMS AND CONDITIONS -+ -+ How to Apply These Terms to Your New Programs -+ -+ If you develop a new program, and you want it to be of the greatest -+possible use to the public, the best way to achieve this is to make it -+free software which everyone can redistribute and change under these terms. -+ -+ To do so, attach the following notices to the program. It is safest -+to attach them to the start of each source file to most effectively -+convey the exclusion of warranty; and each file should have at least -+the "copyright" line and a pointer to where the full notice is found. -+ -+ -+ Copyright (C) -+ -+ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+ -+Also add information on how to contact you by electronic and paper mail. -+ -+If the program is interactive, make it output a short notice like this -+when it starts in an interactive mode: -+ -+ Gnomovision version 69, Copyright (C) year name of author -+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. -+ This is free software, and you are welcome to redistribute it -+ under certain conditions; type `show c' for details. -+ -+The hypothetical commands `show w' and `show c' should show the appropriate -+parts of the General Public License. Of course, the commands you use may -+be called something other than `show w' and `show c'; they could even be -+mouse-clicks or menu items--whatever suits your program. -+ -+You should also get your employer (if you work as a programmer) or your -+school, if any, to sign a "copyright disclaimer" for the program, if -+necessary. Here is a sample; alter the names: -+ -+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program -+ `Gnomovision' (which makes passes at compilers) written by James Hacker. -+ -+ , 1 April 1989 -+ Ty Coon, President of Vice -+ -+This General Public License does not permit incorporating your program into -+proprietary programs. If your program is a subroutine library, you may -+consider it more useful to permit linking proprietary applications with the -+library. If this is what you want to do, use the GNU Library General -+Public License instead of this License. diff --git a/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c b/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c deleted file mode 100644 index 003d4c3fa4..0000000000 --- a/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c +++ /dev/null @@ -1,537 +0,0 @@ -#define _GNU_SOURCE -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define MINORBITS 8 -#define MKDEV(ma,mi) (((ma) << MINORBITS) | (mi)) -#define MAX_ID_LEN 40 -#define MAX_NAME_LEN 40 -#ifndef PATH_MAX -#define PATH_MAX 4096 -#endif - -/* These are all stolen from busybox's libbb to make - * error handling simpler (and since I maintain busybox, - * I'm rather partial to these for error handling). - * -Erik - */ -static const char *const app_name = "makedevs"; -static const char *const memory_exhausted = "memory exhausted"; -static char default_rootdir[]="."; -static char *rootdir = default_rootdir; - -struct name_id { - char name[MAX_NAME_LEN+1]; - unsigned long id; - struct name_id *next; -}; - -static struct name_id *usr_list = NULL; -static struct name_id *grp_list = NULL; - -static void verror_msg(const char *s, va_list p) -{ - fflush(stdout); - fprintf(stderr, "%s: ", app_name); - vfprintf(stderr, s, p); -} - -static void error_msg_and_die(const char *s, ...) -{ - va_list p; - - va_start(p, s); - verror_msg(s, p); - va_end(p); - putc('\n', stderr); - exit(EXIT_FAILURE); -} - -static void vperror_msg(const char *s, va_list p) -{ - int err = errno; - - if (s == 0) - s = ""; - verror_msg(s, p); - if (*s) - s = ": "; - fprintf(stderr, "%s%s\n", s, strerror(err)); -} - -static void perror_msg_and_die(const char *s, ...) -{ - va_list p; - - va_start(p, s); - vperror_msg(s, p); - va_end(p); - exit(EXIT_FAILURE); -} - -static FILE *xfopen(const char *path, const char *mode) -{ - FILE *fp; - - if ((fp = fopen(path, mode)) == NULL) - perror_msg_and_die("%s", path); - return fp; -} - -static char *xstrdup(const char *s) -{ - char *t; - - if (s == NULL) - return NULL; - - t = strdup(s); - - if (t == NULL) - error_msg_and_die(memory_exhausted); - - return t; -} - -static struct name_id* alloc_node(void) -{ - struct name_id *node; - node = (struct name_id*)malloc(sizeof(struct name_id)); - if (node == NULL) { - error_msg_and_die(memory_exhausted); - } - memset((void *)node->name, 0, MAX_NAME_LEN+1); - node->id = 0xffffffff; - node->next = NULL; - return node; -} - -static struct name_id* parse_line(char *line) -{ - char *p; - int i; - char id_buf[MAX_ID_LEN+1]; - struct name_id *node; - node = alloc_node(); - p = line; - i = 0; - // Get name field - while (*p != ':') { - if (i > MAX_NAME_LEN) - error_msg_and_die("Name field too long"); - node->name[i++] = *p++; - } - node->name[i] = '\0'; - p++; - // Skip the second field - while (*p != ':') - p++; - p++; - // Get id field - i = 0; - while (*p != ':') { - if (i > MAX_ID_LEN) - error_msg_and_die("ID filed too long"); - id_buf[i++] = *p++; - } - id_buf[i] = '\0'; - node->id = atol(id_buf); - return node; -} - -static void get_list_from_file(FILE *file, struct name_id **plist) -{ - char *line; - int len = 0; - size_t length = 256; - struct name_id *node, *cur; - - if((line = (char *)malloc(length)) == NULL) { - error_msg_and_die(memory_exhausted); - } - - while ((len = getline(&line, &length, file)) != -1) { - node = parse_line(line); - if (*plist == NULL) { - *plist = node; - cur = *plist; - } else { - cur->next = node; - cur = cur->next; - } - } - - if (line) - free(line); -} - -static unsigned long convert2guid(char *id_buf, struct name_id *search_list) -{ - char *p; - int isnum; - struct name_id *node; - p = id_buf; - isnum = 1; - while (*p != '\0') { - if (!isdigit(*p)) { - isnum = 0; - break; - } - p++; - } - if (isnum) { - // Check for bad user/group name - node = search_list; - while (node != NULL) { - if (!strncmp(node->name, id_buf, strlen(id_buf))) { - fprintf(stderr, "WARNING: Bad user/group name %s detected\n", id_buf); - break; - } - node = node->next; - } - return (unsigned long)atol(id_buf); - } else { - node = search_list; - while (node != NULL) { - if (!strncmp(node->name, id_buf, strlen(id_buf))) - return node->id; - node = node->next; - } - error_msg_and_die("No entry for %s in search list", id_buf); - } -} - -static void free_list(struct name_id *list) -{ - struct name_id *cur; - cur = list; - while (cur != NULL) { - list = cur; - cur = cur->next; - free(list); - } -} - -static void add_new_directory(char *name, char *path, - unsigned long uid, unsigned long gid, unsigned long mode) -{ - mkdir(path, mode); - chown(path, uid, gid); -// printf("Directory: %s %s UID: %ld GID %ld MODE: %04lo\n", path, name, uid, gid, mode); -} - -static void add_new_device(char *name, char *path, unsigned long uid, - unsigned long gid, unsigned long mode, dev_t rdev) -{ - int status; - struct stat sb; - - memset(&sb, 0, sizeof(struct stat)); - status = lstat(path, &sb); - - if (status >= 0) { - /* It is ok for some types of files to not exit on disk (such as - * device nodes), but if they _do_ exist the specified mode had - * better match the actual file or strange things will happen.... */ - if ((mode & S_IFMT) != (sb.st_mode & S_IFMT)) - error_msg_and_die("%s: file type does not match specified type!", path); - } - - mknod(path, mode, rdev); - chown(path, uid, gid); -// printf("Device: %s %s UID: %ld GID: %ld MODE: %04lo MAJOR: %d MINOR: %d\n", -// path, name, uid, gid, mode, (short)(rdev >> 8), (short)(rdev & 0xff)); -} - -static void add_new_file(char *name, char *path, unsigned long uid, - unsigned long gid, unsigned long mode) -{ - int fd = open(path,O_CREAT | O_WRONLY, mode); - if (fd < 0) { - error_msg_and_die("%s: file can not be created!", path); - } else { - close(fd); - } - chmod(path, mode); - chown(path, uid, gid); -// printf("File: %s %s UID: %ld GID: %ld MODE: %04lo\n", -// path, name, gid, uid, mode); -} - - -static void add_new_fifo(char *name, char *path, unsigned long uid, - unsigned long gid, unsigned long mode) -{ - int status; - struct stat sb; - - memset(&sb, 0, sizeof(struct stat)); - status = stat(path, &sb); - - - /* Update the mode if we exist and are a fifo already */ - if (status >= 0 && S_ISFIFO(sb.st_mode)) { - chmod(path, mode); - } else { - if (mknod(path, mode, 0)) - error_msg_and_die("%s: file can not be created with mknod!", path); - } - chown(path, uid, gid); -// printf("File: %s %s UID: %ld GID: %ld MODE: %04lo\n", -// path, name, gid, uid, mode); -} - - -/* device table entries take the form of: - - /dev/mem c 640 0 0 1 1 0 0 - - /dev/zero c 644 root root 1 5 - - - - - type can be one of: - f A regular file - d Directory - c Character special device file - b Block special device file - p Fifo (named pipe) - - I don't bother with symlinks (permissions are irrelevant), hard - links (special cases of regular files), or sockets (why bother). - - Regular files must exist in the target root directory. If a char, - block, fifo, or directory does not exist, it will be created. -*/ -static int interpret_table_entry(char *line) -{ - char *name; - char usr_buf[MAX_ID_LEN]; - char grp_buf[MAX_ID_LEN]; - char path[4096], type; - unsigned long mode = 0755, uid = 0, gid = 0, major = 0, minor = 0; - unsigned long start = 0, increment = 1, count = 0; - - if (0 > sscanf(line, "%40s %c %lo %40s %40s %lu %lu %lu %lu %lu", path, - &type, &mode, usr_buf, grp_buf, &major, &minor, &start, - &increment, &count)) - { - return 1; - } - - uid = convert2guid(usr_buf, usr_list); - gid = convert2guid(grp_buf, grp_list); - - if (strncmp(path, "/", 1)) { - error_msg_and_die("Device table entries require absolute paths"); - } - name = xstrdup(path + 1); - sprintf(path, "%s/%s", rootdir, name); - - switch (type) { - case 'd': - mode |= S_IFDIR; - add_new_directory(name, path, uid, gid, mode); - break; - case 'f': - mode |= S_IFREG; - add_new_file(name, path, uid, gid, mode); - break; - case 'p': - mode |= S_IFIFO; - add_new_fifo(name, path, uid, gid, mode); - break; - case 'c': - case 'b': - mode |= (type == 'c') ? S_IFCHR : S_IFBLK; - if (count > 0) { - int i; - dev_t rdev; - char buf[80]; - - for (i = start; i < start + count; i++) { - sprintf(buf, "%s%d", name, i); - sprintf(path, "%s/%s%d", rootdir, name, i); - /* FIXME: MKDEV uses illicit insider knowledge of kernel - * major/minor representation... */ - rdev = MKDEV(major, minor + (i - start) * increment); - add_new_device(buf, path, uid, gid, mode, rdev); - } - } else { - /* FIXME: MKDEV uses illicit insider knowledge of kernel - * major/minor representation... */ - dev_t rdev = MKDEV(major, minor); - add_new_device(name, path, uid, gid, mode, rdev); - } - break; - default: - error_msg_and_die("Unsupported file type"); - } - if (name) free(name); - return 0; -} - - -static void parse_device_table(FILE * file) -{ - char *line; - size_t length = 256; - int len = 0; - - if((line = (char *)malloc(length)) == NULL) { - error_msg_and_die(memory_exhausted); - } - /* Looks ok so far. The general plan now is to read in one - * line at a time, check for leading comment delimiters ('#'), - * then try and parse the line as a device table. If we fail - * to parse things, try and help the poor fool to fix their - * device table with a useful error msg... */ - - while ((len = getline(&line, &length, file)) != -1) { - /* First trim off any whitespace */ - - /* trim trailing whitespace */ - while (len > 0 && isspace(line[len - 1])) - line[--len] = '\0'; - - /* trim leading whitespace */ - memmove(line, &line[strspn(line, " \n\r\t\v")], len + 1); - - /* If this is NOT a comment line, try to interpret it */ - if (*line != '#') interpret_table_entry(line); - } - - if (line) - free(line); -} - -static int parse_devtable(FILE * devtable) -{ - struct stat sb; - - if (lstat(rootdir, &sb)) { - perror_msg_and_die("%s", rootdir); - } - if (chdir(rootdir)) - perror_msg_and_die("%s", rootdir); - - if (devtable) - parse_device_table(devtable); - - return 0; -} - - -static struct option long_options[] = { - {"root", 1, NULL, 'r'}, - {"help", 0, NULL, 'h'}, - {"version", 0, NULL, 'v'}, - {"devtable", 1, NULL, 'D'}, - {NULL, 0, NULL, 0} -}; - -static char *helptext = - "Usage: makedevs [OPTIONS]\n" - "Build entries based upon device_table.txt\n\n" - "Options:\n" - " -r, -d, --root=DIR Build filesystem from directory DIR (default: cwd)\n" - " -D, --devtable=FILE Use the named FILE as a device table file\n" - " -h, --help Display this help text\n" - " -v, --version Display version information\n\n"; - - -static char *revtext = "$Revision: 0.1 $"; - -int main(int argc, char **argv) -{ - int c, opt; - extern char *optarg; - struct stat statbuf; - char passwd_path[PATH_MAX]; - char group_path[PATH_MAX]; - FILE *passwd_file = NULL; - FILE *group_file = NULL; - FILE *devtable = NULL; - DIR *dir = NULL; - - umask (0); - - if (argc==1) { - fprintf(stderr, helptext); - exit(1); - } - - while ((opt = getopt_long(argc, argv, "D:d:r:qhv", - long_options, &c)) >= 0) { - switch (opt) { - case 'D': - devtable = xfopen(optarg, "r"); - if (fstat(fileno(devtable), &statbuf) < 0) - perror_msg_and_die(optarg); - if (statbuf.st_size < 10) - error_msg_and_die("%s: not a proper device table file", optarg); - break; - case 'h': - printf(helptext); - exit(0); - case 'r': - case 'd': /* for compatibility with mkfs.jffs, genext2fs, etc... */ - if (rootdir != default_rootdir) { - error_msg_and_die("root directory specified more than once"); - } - if ((dir = opendir(optarg)) == NULL) { - perror_msg_and_die(optarg); - } else { - closedir(dir); - } - rootdir = xstrdup(optarg); - break; - - case 'v': - printf("makedevs revision %.*s\n", - (int) strlen(revtext) - 13, revtext + 11); - exit(0); - default: - fprintf(stderr, helptext); - exit(1); - } - } - - if (argv[optind] != NULL) { - fprintf(stderr, helptext); - exit(1); - } - - // Get name-id mapping - sprintf(passwd_path, "%s/etc/passwd", rootdir); - sprintf(group_path, "%s/etc/group", rootdir); - if ((passwd_file = fopen(passwd_path, "r")) != NULL) { - get_list_from_file(passwd_file, &usr_list); - fclose(passwd_file); - } - if ((group_file = fopen(group_path, "r")) != NULL) { - get_list_from_file(group_file, &grp_list); - fclose(group_file); - } - - // Parse devtable - if(devtable) { - parse_devtable(devtable); - fclose(devtable); - } - - // Free list - free_list(usr_list); - free_list(grp_list); - - return 0; -} diff --git a/meta/recipes-devtools/makedevs/makedevs/COPYING.patch b/meta/recipes-devtools/makedevs/makedevs/COPYING.patch new file mode 100644 index 0000000000..3a8902b97a --- /dev/null +++ b/meta/recipes-devtools/makedevs/makedevs/COPYING.patch @@ -0,0 +1,346 @@ +Upstream-Status: Inappropriate [licensing] + +diff -ruN makedevs-1.0.0-orig/COPYING makedevs-1.0.0/COPYING +--- makedevs-1.0.0-orig/COPYING 1970-01-01 08:00:00.000000000 +0800 ++++ makedevs-1.0.0/COPYING 2010-12-09 16:42:20.274984665 +0800 +@@ -0,0 +1,340 @@ ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 ++ ++ Copyright (C) 1989, 1991 Free Software Foundation, Inc. ++ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Everyone is permitted to copy and distribute verbatim copies ++ of this license document, but changing it is not allowed. ++ ++ Preamble ++ ++ The licenses for most software are designed to take away your ++freedom to share and change it. By contrast, the GNU General Public ++License is intended to guarantee your freedom to share and change free ++software--to make sure the software is free for all its users. This ++General Public License applies to most of the Free Software ++Foundation's software and to any other program whose authors commit to ++using it. (Some other Free Software Foundation software is covered by ++the GNU Library General Public License instead.) You can apply it to ++your programs, too. ++ ++ When we speak of free software, we are referring to freedom, not ++price. Our General Public Licenses are designed to make sure that you ++have the freedom to distribute copies of free software (and charge for ++this service if you wish), that you receive source code or can get it ++if you want it, that you can change the software or use pieces of it ++in new free programs; and that you know you can do these things. ++ ++ To protect your rights, we need to make restrictions that forbid ++anyone to deny you these rights or to ask you to surrender the rights. ++These restrictions translate to certain responsibilities for you if you ++distribute copies of the software, or if you modify it. ++ ++ For example, if you distribute copies of such a program, whether ++gratis or for a fee, you must give the recipients all the rights that ++you have. You must make sure that they, too, receive or can get the ++source code. And you must show them these terms so they know their ++rights. ++ ++ We protect your rights with two steps: (1) copyright the software, and ++(2) offer you this license which gives you legal permission to copy, ++distribute and/or modify the software. ++ ++ Also, for each author's protection and ours, we want to make certain ++that everyone understands that there is no warranty for this free ++software. If the software is modified by someone else and passed on, we ++want its recipients to know that what they have is not the original, so ++that any problems introduced by others will not reflect on the original ++authors' reputations. ++ ++ Finally, any free program is threatened constantly by software ++patents. We wish to avoid the danger that redistributors of a free ++program will individually obtain patent licenses, in effect making the ++program proprietary. To prevent this, we have made it clear that any ++patent must be licensed for everyone's free use or not licensed at all. ++ ++ The precise terms and conditions for copying, distribution and ++modification follow. ++ ++ GNU GENERAL PUBLIC LICENSE ++ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ++ ++ 0. This License applies to any program or other work which contains ++a notice placed by the copyright holder saying it may be distributed ++under the terms of this General Public License. The "Program", below, ++refers to any such program or work, and a "work based on the Program" ++means either the Program or any derivative work under copyright law: ++that is to say, a work containing the Program or a portion of it, ++either verbatim or with modifications and/or translated into another ++language. (Hereinafter, translation is included without limitation in ++the term "modification".) Each licensee is addressed as "you". ++ ++Activities other than copying, distribution and modification are not ++covered by this License; they are outside its scope. The act of ++running the Program is not restricted, and the output from the Program ++is covered only if its contents constitute a work based on the ++Program (independent of having been made by running the Program). ++Whether that is true depends on what the Program does. ++ ++ 1. You may copy and distribute verbatim copies of the Program's ++source code as you receive it, in any medium, provided that you ++conspicuously and appropriately publish on each copy an appropriate ++copyright notice and disclaimer of warranty; keep intact all the ++notices that refer to this License and to the absence of any warranty; ++and give any other recipients of the Program a copy of this License ++along with the Program. ++ ++You may charge a fee for the physical act of transferring a copy, and ++you may at your option offer warranty protection in exchange for a fee. ++ ++ 2. You may modify your copy or copies of the Program or any portion ++of it, thus forming a work based on the Program, and copy and ++distribute such modifications or work under the terms of Section 1 ++above, provided that you also meet all of these conditions: ++ ++ a) You must cause the modified files to carry prominent notices ++ stating that you changed the files and the date of any change. ++ ++ b) You must cause any work that you distribute or publish, that in ++ whole or in part contains or is derived from the Program or any ++ part thereof, to be licensed as a whole at no charge to all third ++ parties under the terms of this License. ++ ++ c) If the modified program normally reads commands interactively ++ when run, you must cause it, when started running for such ++ interactive use in the most ordinary way, to print or display an ++ announcement including an appropriate copyright notice and a ++ notice that there is no warranty (or else, saying that you provide ++ a warranty) and that users may redistribute the program under ++ these conditions, and telling the user how to view a copy of this ++ License. (Exception: if the Program itself is interactive but ++ does not normally print such an announcement, your work based on ++ the Program is not required to print an announcement.) ++ ++These requirements apply to the modified work as a whole. If ++identifiable sections of that work are not derived from the Program, ++and can be reasonably considered independent and separate works in ++themselves, then this License, and its terms, do not apply to those ++sections when you distribute them as separate works. But when you ++distribute the same sections as part of a whole which is a work based ++on the Program, the distribution of the whole must be on the terms of ++this License, whose permissions for other licensees extend to the ++entire whole, and thus to each and every part regardless of who wrote it. ++ ++Thus, it is not the intent of this section to claim rights or contest ++your rights to work written entirely by you; rather, the intent is to ++exercise the right to control the distribution of derivative or ++collective works based on the Program. ++ ++In addition, mere aggregation of another work not based on the Program ++with the Program (or with a work based on the Program) on a volume of ++a storage or distribution medium does not bring the other work under ++the scope of this License. ++ ++ 3. You may copy and distribute the Program (or a work based on it, ++under Section 2) in object code or executable form under the terms of ++Sections 1 and 2 above provided that you also do one of the following: ++ ++ a) Accompany it with the complete corresponding machine-readable ++ source code, which must be distributed under the terms of Sections ++ 1 and 2 above on a medium customarily used for software interchange; or, ++ ++ b) Accompany it with a written offer, valid for at least three ++ years, to give any third party, for a charge no more than your ++ cost of physically performing source distribution, a complete ++ machine-readable copy of the corresponding source code, to be ++ distributed under the terms of Sections 1 and 2 above on a medium ++ customarily used for software interchange; or, ++ ++ c) Accompany it with the information you received as to the offer ++ to distribute corresponding source code. (This alternative is ++ allowed only for noncommercial distribution and only if you ++ received the program in object code or executable form with such ++ an offer, in accord with Subsection b above.) ++ ++The source code for a work means the preferred form of the work for ++making modifications to it. For an executable work, complete source ++code means all the source code for all modules it contains, plus any ++associated interface definition files, plus the scripts used to ++control compilation and installation of the executable. However, as a ++special exception, the source code distributed need not include ++anything that is normally distributed (in either source or binary ++form) with the major components (compiler, kernel, and so on) of the ++operating system on which the executable runs, unless that component ++itself accompanies the executable. ++ ++If distribution of executable or object code is made by offering ++access to copy from a designated place, then offering equivalent ++access to copy the source code from the same place counts as ++distribution of the source code, even though third parties are not ++compelled to copy the source along with the object code. ++ ++ 4. You may not copy, modify, sublicense, or distribute the Program ++except as expressly provided under this License. Any attempt ++otherwise to copy, modify, sublicense or distribute the Program is ++void, and will automatically terminate your rights under this License. ++However, parties who have received copies, or rights, from you under ++this License will not have their licenses terminated so long as such ++parties remain in full compliance. ++ ++ 5. You are not required to accept this License, since you have not ++signed it. However, nothing else grants you permission to modify or ++distribute the Program or its derivative works. These actions are ++prohibited by law if you do not accept this License. Therefore, by ++modifying or distributing the Program (or any work based on the ++Program), you indicate your acceptance of this License to do so, and ++all its terms and conditions for copying, distributing or modifying ++the Program or works based on it. ++ ++ 6. Each time you redistribute the Program (or any work based on the ++Program), the recipient automatically receives a license from the ++original licensor to copy, distribute or modify the Program subject to ++these terms and conditions. You may not impose any further ++restrictions on the recipients' exercise of the rights granted herein. ++You are not responsible for enforcing compliance by third parties to ++this License. ++ ++ 7. If, as a consequence of a court judgment or allegation of patent ++infringement or for any other reason (not limited to patent issues), ++conditions are imposed on you (whether by court order, agreement or ++otherwise) that contradict the conditions of this License, they do not ++excuse you from the conditions of this License. If you cannot ++distribute so as to satisfy simultaneously your obligations under this ++License and any other pertinent obligations, then as a consequence you ++may not distribute the Program at all. For example, if a patent ++license would not permit royalty-free redistribution of the Program by ++all those who receive copies directly or indirectly through you, then ++the only way you could satisfy both it and this License would be to ++refrain entirely from distribution of the Program. ++ ++If any portion of this section is held invalid or unenforceable under ++any particular circumstance, the balance of the section is intended to ++apply and the section as a whole is intended to apply in other ++circumstances. ++ ++It is not the purpose of this section to induce you to infringe any ++patents or other property right claims or to contest validity of any ++such claims; this section has the sole purpose of protecting the ++integrity of the free software distribution system, which is ++implemented by public license practices. Many people have made ++generous contributions to the wide range of software distributed ++through that system in reliance on consistent application of that ++system; it is up to the author/donor to decide if he or she is willing ++to distribute software through any other system and a licensee cannot ++impose that choice. ++ ++This section is intended to make thoroughly clear what is believed to ++be a consequence of the rest of this License. ++ ++ 8. If the distribution and/or use of the Program is restricted in ++certain countries either by patents or by copyrighted interfaces, the ++original copyright holder who places the Program under this License ++may add an explicit geographical distribution limitation excluding ++those countries, so that distribution is permitted only in or among ++countries not thus excluded. In such case, this License incorporates ++the limitation as if written in the body of this License. ++ ++ 9. The Free Software Foundation may publish revised and/or new versions ++of the General Public License from time to time. Such new versions will ++be similar in spirit to the present version, but may differ in detail to ++address new problems or concerns. ++ ++Each version is given a distinguishing version number. If the Program ++specifies a version number of this License which applies to it and "any ++later version", you have the option of following the terms and conditions ++either of that version or of any later version published by the Free ++Software Foundation. If the Program does not specify a version number of ++this License, you may choose any version ever published by the Free Software ++Foundation. ++ ++ 10. If you wish to incorporate parts of the Program into other free ++programs whose distribution conditions are different, write to the author ++to ask for permission. For software which is copyrighted by the Free ++Software Foundation, write to the Free Software Foundation; we sometimes ++make exceptions for this. Our decision will be guided by the two goals ++of preserving the free status of all derivatives of our free software and ++of promoting the sharing and reuse of software generally. ++ ++ NO WARRANTY ++ ++ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY ++FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN ++OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES ++PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED ++OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS ++TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE ++PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, ++REPAIR OR CORRECTION. ++ ++ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING ++WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR ++REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, ++INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING ++OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED ++TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY ++YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER ++PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE ++POSSIBILITY OF SUCH DAMAGES. ++ ++ END OF TERMS AND CONDITIONS ++ ++ How to Apply These Terms to Your New Programs ++ ++ If you develop a new program, and you want it to be of the greatest ++possible use to the public, the best way to achieve this is to make it ++free software which everyone can redistribute and change under these terms. ++ ++ To do so, attach the following notices to the program. It is safest ++to attach them to the start of each source file to most effectively ++convey the exclusion of warranty; and each file should have at least ++the "copyright" line and a pointer to where the full notice is found. ++ ++ ++ Copyright (C) ++ ++ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ ++ ++Also add information on how to contact you by electronic and paper mail. ++ ++If the program is interactive, make it output a short notice like this ++when it starts in an interactive mode: ++ ++ Gnomovision version 69, Copyright (C) year name of author ++ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. ++ This is free software, and you are welcome to redistribute it ++ under certain conditions; type `show c' for details. ++ ++The hypothetical commands `show w' and `show c' should show the appropriate ++parts of the General Public License. Of course, the commands you use may ++be called something other than `show w' and `show c'; they could even be ++mouse-clicks or menu items--whatever suits your program. ++ ++You should also get your employer (if you work as a programmer) or your ++school, if any, to sign a "copyright disclaimer" for the program, if ++necessary. Here is a sample; alter the names: ++ ++ Yoyodyne, Inc., hereby disclaims all copyright interest in the program ++ `Gnomovision' (which makes passes at compilers) written by James Hacker. ++ ++ , 1 April 1989 ++ Ty Coon, President of Vice ++ ++This General Public License does not permit incorporating your program into ++proprietary programs. If your program is a subroutine library, you may ++consider it more useful to permit linking proprietary applications with the ++library. If this is what you want to do, use the GNU Library General ++Public License instead of this License. diff --git a/meta/recipes-devtools/makedevs/makedevs/makedevs.c b/meta/recipes-devtools/makedevs/makedevs/makedevs.c new file mode 100644 index 0000000000..771f33ef5a --- /dev/null +++ b/meta/recipes-devtools/makedevs/makedevs/makedevs.c @@ -0,0 +1,589 @@ +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define MINORBITS 8 +#define MKDEV(ma,mi) (((ma) << MINORBITS) | (mi)) +#define MAX_ID_LEN 40 +#define MAX_NAME_LEN 40 +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif +#define VERSION "1.0.1" + +/* These are all stolen from busybox's libbb to make + * error handling simpler (and since I maintain busybox, + * I'm rather partial to these for error handling). + * -Erik + */ +static const char *const app_name = "makedevs"; +static const char *const memory_exhausted = "memory exhausted"; +static char default_rootdir[]="."; +static char *rootdir = default_rootdir; +static int trace = 0; + +struct name_id { + char name[MAX_NAME_LEN+1]; + unsigned long id; + struct name_id *next; +}; + +static struct name_id *usr_list = NULL; +static struct name_id *grp_list = NULL; + +static void verror_msg(const char *s, va_list p) +{ + fflush(stdout); + fprintf(stderr, "%s: ", app_name); + vfprintf(stderr, s, p); +} + +static void error_msg_and_die(const char *s, ...) +{ + va_list p; + + va_start(p, s); + verror_msg(s, p); + va_end(p); + putc('\n', stderr); + exit(EXIT_FAILURE); +} + +static void vperror_msg(const char *s, va_list p) +{ + int err = errno; + + if (s == 0) + s = ""; + verror_msg(s, p); + if (*s) + s = ": "; + fprintf(stderr, "%s%s\n", s, strerror(err)); +} + +static void perror_msg_and_die(const char *s, ...) +{ + va_list p; + + va_start(p, s); + vperror_msg(s, p); + va_end(p); + exit(EXIT_FAILURE); +} + +static FILE *xfopen(const char *path, const char *mode) +{ + FILE *fp; + + if ((fp = fopen(path, mode)) == NULL) + perror_msg_and_die("%s", path); + return fp; +} + +static char *xstrdup(const char *s) +{ + char *t; + + if (s == NULL) + return NULL; + + t = strdup(s); + + if (t == NULL) + error_msg_and_die(memory_exhausted); + + return t; +} + +static struct name_id* alloc_node(void) +{ + struct name_id *node; + node = (struct name_id*)malloc(sizeof(struct name_id)); + if (node == NULL) { + error_msg_and_die(memory_exhausted); + } + memset((void *)node->name, 0, MAX_NAME_LEN+1); + node->id = 0xffffffff; + node->next = NULL; + return node; +} + +static struct name_id* parse_line(char *line) +{ + char *p; + int i; + char id_buf[MAX_ID_LEN+1]; + struct name_id *node; + node = alloc_node(); + p = line; + i = 0; + // Get name field + while (*p != ':') { + if (i > MAX_NAME_LEN) + error_msg_and_die("Name field too long"); + node->name[i++] = *p++; + } + node->name[i] = '\0'; + p++; + // Skip the second field + while (*p != ':') + p++; + p++; + // Get id field + i = 0; + while (*p != ':') { + if (i > MAX_ID_LEN) + error_msg_and_die("ID filed too long"); + id_buf[i++] = *p++; + } + id_buf[i] = '\0'; + node->id = atol(id_buf); + return node; +} + +static void get_list_from_file(FILE *file, struct name_id **plist) +{ + char *line; + int len = 0; + size_t length = 256; + struct name_id *node, *cur; + + if((line = (char *)malloc(length)) == NULL) { + error_msg_and_die(memory_exhausted); + } + + while ((len = getline(&line, &length, file)) != -1) { + node = parse_line(line); + if (*plist == NULL) { + *plist = node; + cur = *plist; + } else { + cur->next = node; + cur = cur->next; + } + } + + if (line) + free(line); +} + +static unsigned long convert2guid(char *id_buf, struct name_id *search_list) +{ + char *p; + int isnum; + struct name_id *node; + p = id_buf; + isnum = 1; + while (*p != '\0') { + if (!isdigit(*p)) { + isnum = 0; + break; + } + p++; + } + if (isnum) { + // Check for bad user/group name + node = search_list; + while (node != NULL) { + if (!strncmp(node->name, id_buf, strlen(id_buf))) { + fprintf(stderr, "WARNING: Bad user/group name %s detected\n", id_buf); + break; + } + node = node->next; + } + return (unsigned long)atol(id_buf); + } else { + node = search_list; + while (node != NULL) { + if (!strncmp(node->name, id_buf, strlen(id_buf))) + return node->id; + node = node->next; + } + error_msg_and_die("No entry for %s in search list", id_buf); + } +} + +static void free_list(struct name_id *list) +{ + struct name_id *cur; + cur = list; + while (cur != NULL) { + list = cur; + cur = cur->next; + free(list); + } +} + +static void add_new_directory(char *name, char *path, + unsigned long uid, unsigned long gid, unsigned long mode) +{ + if (trace) + fprintf(stderr, "Directory: %s %s UID: %ld GID %ld MODE: %04lo", path, name, uid, gid, mode); + + if (mkdir(path, mode) < 0) { + if (EEXIST == errno) { + /* Unconditionally apply the mode setting to the existing directory. + * XXX should output something when trace */ + chmod(path, mode & ~S_IFMT); + } + } + if (trace) + putc('\n', stderr); + chown(path, uid, gid); +} + +static void add_new_device(char *name, char *path, unsigned long uid, + unsigned long gid, unsigned long mode, dev_t rdev) +{ + int status; + struct stat sb; + + if (trace) { + fprintf(stderr, "Device: %s %s UID: %ld GID: %ld MODE: %04lo MAJOR: %d MINOR: %d", + path, name, uid, gid, mode, (short)(rdev >> 8), (short)(rdev & 0xff)); + } + + memset(&sb, 0, sizeof(struct stat)); + status = lstat(path, &sb); + if (status >= 0) { + /* It is ok for some types of files to not exit on disk (such as + * device nodes), but if they _do_ exist, the file type bits had + * better match those of the actual file or strange things will happen... */ + if ((mode & S_IFMT) != (sb.st_mode & S_IFMT)) { + if (trace) + putc('\n', stderr); + error_msg_and_die("%s: existing file (04%o) type does not match specified file type (04%lo)!", + path, (sb.st_mode & S_IFMT), (mode & S_IFMT)); + } + if (mode != sb.st_mode) { + if (trace) + fprintf(stderr, " -- applying new mode 04%lo (old was 04%o)\n", mode & ~S_IFMT, sb.st_mode & ~S_IFMT); + /* Apply the mode setting to the existing device node */ + chmod(path, mode & ~S_IFMT); + } + else { + if (trace) + fprintf(stderr, " -- extraneous entry in table\n", path); + } + } + else { + mknod(path, mode, rdev); + if (trace) + putc('\n', stderr); + + } + + chown(path, uid, gid); +} + +static void add_new_file(char *name, char *path, unsigned long uid, + unsigned long gid, unsigned long mode) +{ + if (trace) { + fprintf(stderr, "File: %s %s UID: %ld GID: %ld MODE: %04lo\n", + path, name, gid, uid, mode); + } + + int fd = open(path,O_CREAT | O_WRONLY, mode); + if (fd < 0) { + error_msg_and_die("%s: file can not be created!", path); + } else { + close(fd); + } + chmod(path, mode); + chown(path, uid, gid); +} + + +static void add_new_fifo(char *name, char *path, unsigned long uid, + unsigned long gid, unsigned long mode) +{ + if (trace) { + printf("Fifo: %s %s UID: %ld GID: %ld MODE: %04lo\n", + path, name, gid, uid, mode); + } + + int status; + struct stat sb; + + memset(&sb, 0, sizeof(struct stat)); + status = stat(path, &sb); + + + /* Update the mode if we exist and are a fifo already */ + if (status >= 0 && S_ISFIFO(sb.st_mode)) { + chmod(path, mode); + } else { + if (mknod(path, mode, 0)) + error_msg_and_die("%s: file can not be created with mknod!", path); + } + chown(path, uid, gid); +} + + +/* device table entries take the form of: + + /dev/mem c 640 0 0 1 1 0 0 - + /dev/zero c 644 root root 1 5 - - - + + type can be one of: + f A regular file + d Directory + c Character special device file + b Block special device file + p Fifo (named pipe) + + I don't bother with symlinks (permissions are irrelevant), hard + links (special cases of regular files), or sockets (why bother). + + Regular files must exist in the target root directory. If a char, + block, fifo, or directory does not exist, it will be created. +*/ +static int interpret_table_entry(char *line) +{ + char *name; + char usr_buf[MAX_ID_LEN]; + char grp_buf[MAX_ID_LEN]; + char path[4096], type; + unsigned long mode = 0755, uid = 0, gid = 0, major = 0, minor = 0; + unsigned long start = 0, increment = 1, count = 0; + + if (0 > sscanf(line, "%40s %c %lo %40s %40s %lu %lu %lu %lu %lu", path, + &type, &mode, usr_buf, grp_buf, &major, &minor, &start, + &increment, &count)) + { + fprintf(stderr, "%s: sscanf returned < 0 for line '%s'\n", app_name, line); + return 1; + } + + uid = convert2guid(usr_buf, usr_list); + gid = convert2guid(grp_buf, grp_list); + + if (strncmp(path, "/", 1)) { + error_msg_and_die("Device table entries require absolute paths"); + } + name = xstrdup(path + 1); + /* prefix path with rootdir */ + sprintf(path, "%s/%s", rootdir, name); + + /* XXX Why is name passed into all of the add_new_*() routines? */ + switch (type) { + case 'd': + mode |= S_IFDIR; + add_new_directory(name, path, uid, gid, mode); + break; + case 'f': + mode |= S_IFREG; + add_new_file(name, path, uid, gid, mode); + break; + case 'p': + mode |= S_IFIFO; + add_new_fifo(name, path, uid, gid, mode); + break; + case 'c': + case 'b': + mode |= (type == 'c') ? S_IFCHR : S_IFBLK; + if (count > 0) { + int i; + dev_t rdev; + char buf[80]; + + for (i = start; i < start + count; i++) { + sprintf(buf, "%s%d", name, i); + sprintf(path, "%s/%s%d", rootdir, name, i); + /* FIXME: MKDEV uses illicit insider knowledge of kernel + * major/minor representation... */ + rdev = MKDEV(major, minor + (i - start) * increment); + sprintf(path, "%s/%s\0", rootdir, buf); + add_new_device(buf, path, uid, gid, mode, rdev); + } + } else { + /* FIXME: MKDEV uses illicit insider knowledge of kernel + * major/minor representation... */ + dev_t rdev = MKDEV(major, minor); + add_new_device(name, path, uid, gid, mode, rdev); + } + break; + default: + error_msg_and_die("Unsupported file type"); + } + if (name) free(name); + return 0; +} + + +static void parse_device_table(FILE * file) +{ + char *line; + size_t length = 256; + int len = 0; + + if((line = (char *)malloc(length)) == NULL) { + error_msg_and_die(memory_exhausted); + } + /* Looks ok so far. The general plan now is to read in one + * line at a time, trim off leading and trailing whitespace, + * check for leading comment delimiters ('#') or a blank line, + * then try and parse the line as a device table entry. If we fail + * to parse things, try and help the poor fool to fix their + * device table with a useful error msg... */ + + while ((len = getline(&line, &length, file)) != -1) { + /* First trim off any whitespace */ + + /* trim trailing whitespace */ + while (len > 0 && isspace(line[len - 1])) + line[--len] = '\0'; + + /* trim leading whitespace */ + memmove(line, &line[strspn(line, " \n\r\t\v")], len + 1); + + /* If this is NOT a comment or an empty line, try to interpret it */ + if (*line != '#' && *line != '\0') interpret_table_entry(line); + } + + if (line) + free(line); +} + +static int parse_devtable(FILE * devtable) +{ + struct stat sb; + + if (lstat(rootdir, &sb)) { + perror_msg_and_die("%s", rootdir); + } + if (chdir(rootdir)) + perror_msg_and_die("%s", rootdir); + + if (devtable) + parse_device_table(devtable); + + return 0; +} + + +static struct option long_options[] = { + {"root", 1, NULL, 'r'}, + {"help", 0, NULL, 'h'}, + {"trace", 0, NULL, 't'}, + {"version", 0, NULL, 'v'}, + {"devtable", 1, NULL, 'D'}, + {NULL, 0, NULL, 0} +}; + +static char *helptext = + "Usage: makedevs [OPTIONS]\n" + "Build entries based upon device_table.txt\n\n" + "Options:\n" + " -r, -d, --root=DIR Build filesystem from directory DIR (default: cwd)\n" + " -D, --devtable=FILE Use the named FILE as a device table file\n" + " -h, --help Display this help text\n" + " -t, --trace Be verbose\n" + " -v, --version Display version information\n\n"; + + +int main(int argc, char **argv) +{ + int c, opt; + extern char *optarg; + struct stat statbuf; + char passwd_path[PATH_MAX]; + char group_path[PATH_MAX]; + FILE *passwd_file = NULL; + FILE *group_file = NULL; + FILE *devtable = NULL; + DIR *dir = NULL; + + umask (0); + + if (argc==1) { + fprintf(stderr, helptext); + exit(1); + } + + while ((opt = getopt_long(argc, argv, "D:d:r:htv", + long_options, &c)) >= 0) { + switch (opt) { + case 'D': + devtable = xfopen(optarg, "r"); + if (fstat(fileno(devtable), &statbuf) < 0) + perror_msg_and_die(optarg); + if (statbuf.st_size < 10) + error_msg_and_die("%s: not a proper device table file", optarg); + break; + case 'h': + printf(helptext); + exit(0); + case 'r': + case 'd': /* for compatibility with mkfs.jffs, genext2fs, etc... */ + if (rootdir != default_rootdir) { + error_msg_and_die("root directory specified more than once"); + } + if ((dir = opendir(optarg)) == NULL) { + perror_msg_and_die(optarg); + } else { + closedir(dir); + } + /* If "/" is specified, use "" because rootdir is always prepended to a + * string that starts with "/" */ + if (0 == strcmp(optarg, "/")) + rootdir = xstrdup(""); + else + rootdir = xstrdup(optarg); + break; + + case 't': + trace = 1; + break; + + case 'v': + printf("%s: %s\n", app_name, VERSION); + exit(0); + default: + fprintf(stderr, helptext); + exit(1); + } + } + + if (argv[optind] != NULL) { + fprintf(stderr, helptext); + exit(1); + } + + // Get name-id mapping + sprintf(passwd_path, "%s/etc/passwd", rootdir); + sprintf(group_path, "%s/etc/group", rootdir); + if ((passwd_file = fopen(passwd_path, "r")) != NULL) { + get_list_from_file(passwd_file, &usr_list); + fclose(passwd_file); + } + if ((group_file = fopen(group_path, "r")) != NULL) { + get_list_from_file(group_file, &grp_list); + fclose(group_file); + } + + // Parse devtable + if(devtable) { + parse_devtable(devtable); + fclose(devtable); + } + + // Free list + free_list(usr_list); + free_list(grp_list); + + return 0; +} diff --git a/meta/recipes-devtools/makedevs/makedevs_1.0.0.bb b/meta/recipes-devtools/makedevs/makedevs_1.0.0.bb deleted file mode 100644 index 17b9fcec03..0000000000 --- a/meta/recipes-devtools/makedevs/makedevs_1.0.0.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "A tool to make device nodes" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -SECTION = "base" -SRC_URI = "file://makedevs.c \ - file://COPYING.patch" -PR = "r7" - -FILES_${PN}_append_class-nativesdk = " ${datadir}" - -do_configure() { - install -m 0644 ${WORKDIR}/makedevs.c ${S}/ -} - -do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -o ${S}/makedevs ${S}/makedevs.c -} - -do_install() { - install -d ${D}${base_sbindir} - install -m 0755 ${S}/makedevs ${D}${base_sbindir}/makedevs -} - -do_install_append_class-nativesdk() { - install -d ${D}${datadir} - install -m 644 ${COREBASE}/meta/files/device_table-minimal.txt ${D}${datadir}/ -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb b/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb new file mode 100644 index 0000000000..6aa75a8743 --- /dev/null +++ b/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "A tool to make device nodes" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" +SECTION = "base" +SRC_URI = "file://makedevs.c \ + file://COPYING.patch" + +FILES_${PN}_append_class-nativesdk = " ${datadir}" + +do_configure() { + install -m 0644 ${WORKDIR}/makedevs.c ${S}/ +} + +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} -o ${S}/makedevs ${S}/makedevs.c +} + +do_install() { + install -d ${D}${base_sbindir} + install -m 0755 ${S}/makedevs ${D}${base_sbindir}/makedevs +} + +do_install_append_class-nativesdk() { + install -d ${D}${datadir} + install -m 644 ${COREBASE}/meta/files/device_table-minimal.txt ${D}${datadir}/ +} + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf