From e7f99fc33a5cdd678b847203f556d681df55b483 Mon Sep 17 00:00:00 2001 From: Jan-Benedict Glaw Date: Sun, 1 Jan 2006 14:23:47 +0100 Subject: [PATCH] --- yaml --- r: 15909 b: refs/heads/master c: 6073aa643f52fd12b02f0532dc96287f4c3293b5 h: refs/heads/master i: 15907: 32d0a6f4426083c9fe9403a999cfba76ae37f96c v: v3 --- [refs] | 2 +- trunk/.gitignore | 1 - trunk/arch/x86_64/boot/.gitignore | 3 -- trunk/arch/x86_64/boot/tools/.gitignore | 1 - trunk/arch/x86_64/ia32/.gitignore | 1 - trunk/drivers/char/.gitignore | 2 +- trunk/drivers/ieee1394/.gitignore | 1 - trunk/drivers/md/.gitignore | 4 -- trunk/drivers/net/wan/.gitignore | 1 - trunk/drivers/scsi/.gitignore | 3 -- trunk/drivers/scsi/aic7xxx/.gitignore | 6 --- trunk/include/asm-mips/.gitignore | 1 + trunk/kernel/.gitignore | 5 --- trunk/scripts/.gitignore | 5 +-- trunk/scripts/genksyms/.gitignore | 4 -- trunk/scripts/kconfig/.gitignore | 1 - trunk/scripts/kconfig/lxdialog/.gitignore | 4 -- trunk/scripts/kconfig/lxdialog/checklist.c | 47 +++++++++++++++------- trunk/scripts/kconfig/lxdialog/dialog.h | 9 ++++- trunk/scripts/kconfig/lxdialog/lxdialog.c | 12 +++++- trunk/scripts/package/Makefile | 2 +- trunk/scripts/package/buildtar | 31 ++++++-------- 22 files changed, 69 insertions(+), 77 deletions(-) delete mode 100644 trunk/arch/x86_64/boot/.gitignore delete mode 100644 trunk/arch/x86_64/boot/tools/.gitignore delete mode 100644 trunk/arch/x86_64/ia32/.gitignore delete mode 100644 trunk/drivers/ieee1394/.gitignore delete mode 100644 trunk/drivers/md/.gitignore delete mode 100644 trunk/drivers/net/wan/.gitignore delete mode 100644 trunk/drivers/scsi/.gitignore delete mode 100644 trunk/drivers/scsi/aic7xxx/.gitignore create mode 100644 trunk/include/asm-mips/.gitignore delete mode 100644 trunk/kernel/.gitignore delete mode 100644 trunk/scripts/genksyms/.gitignore delete mode 100644 trunk/scripts/kconfig/lxdialog/.gitignore diff --git a/[refs] b/[refs] index a744832a15db..b5535b8a5580 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: febf7ea4bedcd36fba0843db726bba28d22bf89a +refs/heads/master: 6073aa643f52fd12b02f0532dc96287f4c3293b5 diff --git a/trunk/.gitignore b/trunk/.gitignore index a4b576eb9c00..5014bfa48ac1 100644 --- a/trunk/.gitignore +++ b/trunk/.gitignore @@ -23,7 +23,6 @@ Module.symvers # Generated include files # include/asm -include/asm-*/asm-offsets.h include/config include/linux/autoconf.h include/linux/compile.h diff --git a/trunk/arch/x86_64/boot/.gitignore b/trunk/arch/x86_64/boot/.gitignore deleted file mode 100644 index 495f20c085de..000000000000 --- a/trunk/arch/x86_64/boot/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -bootsect -bzImage -setup diff --git a/trunk/arch/x86_64/boot/tools/.gitignore b/trunk/arch/x86_64/boot/tools/.gitignore deleted file mode 100644 index 378eac25d311..000000000000 --- a/trunk/arch/x86_64/boot/tools/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/trunk/arch/x86_64/ia32/.gitignore b/trunk/arch/x86_64/ia32/.gitignore deleted file mode 100644 index 48ab174fe5f1..000000000000 --- a/trunk/arch/x86_64/ia32/.gitignore +++ /dev/null @@ -1 +0,0 @@ -vsyscall*.so diff --git a/trunk/drivers/char/.gitignore b/trunk/drivers/char/.gitignore index 73dfdcebfbba..2b6b1d772ed7 100644 --- a/trunk/drivers/char/.gitignore +++ b/trunk/drivers/char/.gitignore @@ -1,3 +1,3 @@ consolemap_deftbl.c defkeymap.c -qtronixmap.c + diff --git a/trunk/drivers/ieee1394/.gitignore b/trunk/drivers/ieee1394/.gitignore deleted file mode 100644 index 33da10a25323..000000000000 --- a/trunk/drivers/ieee1394/.gitignore +++ /dev/null @@ -1 +0,0 @@ -oui.c diff --git a/trunk/drivers/md/.gitignore b/trunk/drivers/md/.gitignore deleted file mode 100644 index a7afec6b19c6..000000000000 --- a/trunk/drivers/md/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -mktables -raid6altivec*.c -raid6int*.c -raid6tables.c diff --git a/trunk/drivers/net/wan/.gitignore b/trunk/drivers/net/wan/.gitignore deleted file mode 100644 index dae3ea6bb18c..000000000000 --- a/trunk/drivers/net/wan/.gitignore +++ /dev/null @@ -1 +0,0 @@ -wanxlfw.inc diff --git a/trunk/drivers/scsi/.gitignore b/trunk/drivers/scsi/.gitignore deleted file mode 100644 index b385af314356..000000000000 --- a/trunk/drivers/scsi/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -53c700_d.h -53c7xx_d.h -53c7xx_u.h diff --git a/trunk/drivers/scsi/aic7xxx/.gitignore b/trunk/drivers/scsi/aic7xxx/.gitignore deleted file mode 100644 index b8ee24d5748a..000000000000 --- a/trunk/drivers/scsi/aic7xxx/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -aic79xx_reg.h -aic79xx_reg_print.c -aic79xx_seq.h -aic7xxx_reg.h -aic7xxx_reg_print.c -aic7xxx_seq.h diff --git a/trunk/include/asm-mips/.gitignore b/trunk/include/asm-mips/.gitignore new file mode 100644 index 000000000000..4ec57ad5bc3c --- /dev/null +++ b/trunk/include/asm-mips/.gitignore @@ -0,0 +1 @@ +asm_offsets.h diff --git a/trunk/kernel/.gitignore b/trunk/kernel/.gitignore deleted file mode 100644 index f2ab70073bd4..000000000000 --- a/trunk/kernel/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# -# Generated files -# -config_data.h -config_data.gz diff --git a/trunk/scripts/.gitignore b/trunk/scripts/.gitignore index a234e524a490..b46d68bb9e17 100644 --- a/trunk/scripts/.gitignore +++ b/trunk/scripts/.gitignore @@ -1,7 +1,4 @@ -# -# Generated files -# conmakehash kallsyms pnmtologo -bin2c + diff --git a/trunk/scripts/genksyms/.gitignore b/trunk/scripts/genksyms/.gitignore deleted file mode 100644 index be5cadb1b907..000000000000 --- a/trunk/scripts/genksyms/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -keywords.c -lex.c -parse.[ch] -genksyms diff --git a/trunk/scripts/kconfig/.gitignore b/trunk/scripts/kconfig/.gitignore index e8ad1f6b3da4..2dac3442e0ac 100644 --- a/trunk/scripts/kconfig/.gitignore +++ b/trunk/scripts/kconfig/.gitignore @@ -5,7 +5,6 @@ config* lex.*.c *.tab.c *.tab.h -zconf.hash.c # # configuration programs diff --git a/trunk/scripts/kconfig/lxdialog/.gitignore b/trunk/scripts/kconfig/lxdialog/.gitignore deleted file mode 100644 index 90b08ff025a6..000000000000 --- a/trunk/scripts/kconfig/lxdialog/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# -# Generated files -# -lxdialog diff --git a/trunk/scripts/kconfig/lxdialog/checklist.c b/trunk/scripts/kconfig/lxdialog/checklist.c index db07ae73e051..3fb681fb9632 100644 --- a/trunk/scripts/kconfig/lxdialog/checklist.c +++ b/trunk/scripts/kconfig/lxdialog/checklist.c @@ -23,7 +23,7 @@ #include "dialog.h" -static int list_width, check_x, item_x; +static int list_width, check_x, item_x, checkflag; /* * Print list item @@ -41,7 +41,10 @@ static void print_item(WINDOW * win, const char *item, int status, int choice, wmove(win, choice, check_x); wattrset(win, selected ? check_selected_attr : check_attr); - wprintw(win, "(%c)", status ? 'X' : ' '); + if (checkflag == FLAG_CHECK) + wprintw(win, "[%c]", status ? 'X' : ' '); + else + wprintw(win, "(%c)", status ? 'X' : ' '); wattrset(win, selected ? tag_selected_attr : tag_attr); mvwaddch(win, choice, item_x, item[0]); @@ -106,16 +109,18 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected) /* * Display a dialog box with a list of options that can be turned on or off - * in the style of radiolist (only one option turned on at a time). + * The `flag' parameter is used to select between radiolist and checklist. */ int dialog_checklist(const char *title, const char *prompt, int height, int width, int list_height, int item_no, - const char *const *items) + const char *const *items, int flag) { int i, x, y, box_x, box_y; int key = 0, button = 0, choice = 0, scroll = 0, max_choice, *status; WINDOW *dialog, *list; + checkflag = flag; + /* Allocate space for storing item on/off status */ if ((status = malloc(sizeof(int) * item_no)) == NULL) { endwin(); @@ -298,20 +303,34 @@ int dialog_checklist(const char *title, const char *prompt, int height, case ' ': case '\n': if (!button) { - if (!status[scroll + choice]) { - for (i = 0; i < item_no; i++) - status[i] = 0; - status[scroll + choice] = 1; - for (i = 0; i < max_choice; i++) - print_item(list, items[(scroll + i) * 3 + 1], - status[scroll + i], i, i == choice); + if (flag == FLAG_CHECK) { + status[scroll + choice] = !status[scroll + choice]; + wmove(list, choice, check_x); + wattrset(list, check_selected_attr); + wprintw(list, "[%c]", status[scroll + choice] ? 'X' : ' '); + } else { + if (!status[scroll + choice]) { + for (i = 0; i < item_no; i++) + status[i] = 0; + status[scroll + choice] = 1; + for (i = 0; i < max_choice; i++) + print_item(list, items[(scroll + i) * 3 + 1], + status[scroll + i], i, i == choice); + } } wnoutrefresh(list); wrefresh(dialog); - for (i = 0; i < item_no; i++) - if (status[i]) - fprintf(stderr, "%s", items[i * 3]); + for (i = 0; i < item_no; i++) { + if (status[i]) { + if (flag == FLAG_CHECK) { + fprintf(stderr, "\"%s\" ", items[i * 3]); + } else { + fprintf(stderr, "%s", items[i * 3]); + } + + } + } } else fprintf(stderr, "%s", items[(scroll + choice) * 3]); delwin(dialog); diff --git a/trunk/scripts/kconfig/lxdialog/dialog.h b/trunk/scripts/kconfig/lxdialog/dialog.h index af3cf716e215..f882204cb3c2 100644 --- a/trunk/scripts/kconfig/lxdialog/dialog.h +++ b/trunk/scripts/kconfig/lxdialog/dialog.h @@ -160,7 +160,7 @@ int dialog_menu(const char *title, const char *prompt, int height, int width, const char *const *items); int dialog_checklist(const char *title, const char *prompt, int height, int width, int list_height, int item_no, - const char *const *items); + const char *const *items, int flag); extern char dialog_input_result[]; int dialog_inputbox(const char *title, const char *prompt, int height, int width, const char *init); @@ -175,3 +175,10 @@ int dialog_inputbox(const char *title, const char *prompt, int height, * -- uppercase chars are used to invoke the button (M_EVENT + 'O') */ #define M_EVENT (KEY_MAX+1) + +/* + * The `flag' parameter in checklist is used to select between + * radiolist and checklist + */ +#define FLAG_CHECK 1 +#define FLAG_RADIO 0 diff --git a/trunk/scripts/kconfig/lxdialog/lxdialog.c b/trunk/scripts/kconfig/lxdialog/lxdialog.c index 79f6c5fb5cef..2c34ea1e0a41 100644 --- a/trunk/scripts/kconfig/lxdialog/lxdialog.c +++ b/trunk/scripts/kconfig/lxdialog/lxdialog.c @@ -31,11 +31,12 @@ struct Mode { jumperFn *jumper; }; -jumperFn j_menu, j_radiolist, j_yesno, j_textbox, j_inputbox; +jumperFn j_menu, j_checklist, j_radiolist, j_yesno, j_textbox, j_inputbox; jumperFn j_msgbox, j_infobox; static struct Mode modes[] = { {"--menu", 9, 0, 3, j_menu}, + {"--checklist", 9, 0, 3, j_checklist}, {"--radiolist", 9, 0, 3, j_radiolist}, {"--yesno", 5, 5, 1, j_yesno}, {"--textbox", 5, 5, 1, j_textbox}, @@ -150,6 +151,7 @@ static void Usage(const char *name) \nBox options:\ \n\ \n --menu ...\ +\n --checklist ...\ \n --radiolist ...\ \n --textbox \ \n --inputbox []\ @@ -168,10 +170,16 @@ int j_menu(const char *t, int ac, const char *const *av) atoi(av[5]), av[6], (ac - 6) / 2, av + 7); } +int j_checklist(const char *t, int ac, const char *const *av) +{ + return dialog_checklist(t, av[2], atoi(av[3]), atoi(av[4]), + atoi(av[5]), (ac - 6) / 3, av + 6, FLAG_CHECK); +} + int j_radiolist(const char *t, int ac, const char *const *av) { return dialog_checklist(t, av[2], atoi(av[3]), atoi(av[4]), - atoi(av[5]), (ac - 6) / 3, av + 6); + atoi(av[5]), (ac - 6) / 3, av + 6, FLAG_RADIO); } int j_textbox(const char *t, int ac, const char *const *av) diff --git a/trunk/scripts/package/Makefile b/trunk/scripts/package/Makefile index f3e7e8e4a500..c201ef001f09 100644 --- a/trunk/scripts/package/Makefile +++ b/trunk/scripts/package/Makefile @@ -84,7 +84,7 @@ clean-dirs += $(objtree)/debian/ # --------------------------------------------------------------------------- .PHONY: tar%pkg tar%pkg: - $(MAKE) + $(MAKE) KBUILD_SRC= $(CONFIG_SHELL) $(srctree)/scripts/package/buildtar $@ clean-dirs += $(objtree)/tar-install/ diff --git a/trunk/scripts/package/buildtar b/trunk/scripts/package/buildtar index d8fffe6f8906..88b5281ac41e 100644 --- a/trunk/scripts/package/buildtar +++ b/trunk/scripts/package/buildtar @@ -1,9 +1,9 @@ #!/bin/sh # -# buildtar 0.0.3 +# buildtar 0.0.4 # -# (C) 2004-2005 by Jan-Benedict Glaw +# (C) 2004-2006 by Jan-Benedict Glaw # # This script is used to compile a tarball from the currently # prepared kernel. Based upon the builddeb script from @@ -15,9 +15,8 @@ set -e # # Some variables and settings used throughout the script # -version="${VERSION}.${PATCHLEVEL}.${SUBLEVEL}${EXTRAVERSION}${EXTRANAME}" tmpdir="${objtree}/tar-install" -tarball="${objtree}/linux-${version}.tar" +tarball="${objtree}/linux-${KERNELRELEASE}.tar" # @@ -53,21 +52,17 @@ mkdir -p -- "${tmpdir}/boot" # # Try to install modules # -if ! make INSTALL_MOD_PATH="${tmpdir}" modules_install; then - echo "" >&2 - echo "Ignoring error at module_install time, since that could be" >&2 - echo "a result of missing local modutils/module-init-tools," >&2 - echo "or you just didn't compile in module support at all..." >&2 - echo "" >&2 +if grep -q '^CONFIG_MODULES=y' "${objtree}/.config"; then + make ARCH="${ARCH}" O="${objtree}" KBUILD_SRC= INSTALL_MOD_PATH="${tmpdir}" modules_install fi # # Install basic kernel files # -cp -v -- System.map "${tmpdir}/boot/System.map-${version}" -cp -v -- .config "${tmpdir}/boot/config-${version}" -cp -v -- vmlinux "${tmpdir}/boot/vmlinux-${version}" +cp -v -- "${objtree}/System.map" "${tmpdir}/boot/System.map-${KERNELRELEASE}" +cp -v -- "${objtree}/.config" "${tmpdir}/boot/config-${KERNELRELEASE}" +cp -v -- "${objtree}/vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" # @@ -75,17 +70,17 @@ cp -v -- vmlinux "${tmpdir}/boot/vmlinux-${version}" # case "${ARCH}" in i386) - [ -f arch/i386/boot/bzImage ] && cp -v -- arch/i386/boot/bzImage "${tmpdir}/boot/vmlinuz-${version}" + [ -f "${objtree}/arch/i386/boot/bzImage" ] && cp -v -- "${objtree}/arch/i386/boot/bzImage" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}" ;; alpha) - [ -f arch/alpha/boot/vmlinux.gz ] && cp -v -- arch/alpha/boot/vmlinux.gz "${tmpdir}/boot/vmlinuz-${version}" + [ -f "${objtree}/arch/alpha/boot/vmlinux.gz" ] && cp -v -- "${objtree}/arch/alpha/boot/vmlinux.gz" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}" ;; vax) - [ -f vmlinux.SYS ] && cp -v -- vmlinux.SYS "${tmpdir}/boot/vmlinux-${version}.SYS" - [ -f vmlinux.dsk ] && cp -v -- vmlinux.dsk "${tmpdir}/boot/vmlinux-${version}.dsk" + [ -f "${objtree}/vmlinux.SYS" ] && cp -v -- "${objtree}/vmlinux.SYS" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}.SYS" + [ -f "${objtree}/vmlinux.dsk" ] && cp -v -- "${objtree}/vmlinux.dsk" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}.dsk" ;; *) - [ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-kbuild-${version}" + [ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-kbuild-${KERNELRELEASE}" echo "" >&2 echo '** ** ** WARNING ** ** **' >&2 echo "" >&2