adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] kbuild scripts: replace gawk, head, bc with shell, update

Browse source 
Replacing overhead of using some (external) programs
  instead of good old `sh'.

Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: William Stearns <wstearns@pobox.com>
Cc: Martin Schlemmer <azarah@nosferatu.za.org>
Signed-off-by: Oleg Verych <olecom@flower.upol.cz>
Acked-by: Mark Lord <lkml@rtr.ca>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Oleg Verych 2007-02-06 02:18:20 +01:00 committed by Linus Torvalds
parent 62d0cfcb27
commit f6112ec27a
2 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
scripts/gen_initramfs_list.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Copyright (C) Martin Schlemmer <azarah@nosferatu.za.org> # Copyright (C) Martin Schlemmer <azarah@nosferatu.za.org>
# Copyright (c) 2006 Sam Ravnborg <sam@ravnborg.org> # Copyright (C) 2006 Sam Ravnborg <sam@ravnborg.org>
# #
# Released under the terms of the GNU GPL # Released under the terms of the GNU GPL
# #
@ -17,15 +17,15 @@ cat << EOF
Usage: Usage:
$0 [-o <file>] [-u <uid>] [-g <gid>] {-d | <cpio_source>} ... $0 [-o <file>] [-u <uid>] [-g <gid>] {-d | <cpio_source>} ...
-o <file> Create gzipped initramfs file named <file> using -o <file> Create gzipped initramfs file named <file> using
gen_init_cpio and gzip gen_init_cpio and gzip
-u <uid> User ID to map to user ID 0 (root). -u <uid> User ID to map to user ID 0 (root).
<uid> is only meaningful if <cpio_source> <uid> is only meaningful if <cpio_source>
is a directory. is a directory.
-g <gid> Group ID to map to group ID 0 (root). -g <gid> Group ID to map to group ID 0 (root).
<gid> is only meaningful if <cpio_source> <gid> is only meaningful if <cpio_source>
is a directory. is a directory.
<cpio_source> File list or directory for cpio archive. <cpio_source> File list or directory for cpio archive.
If <cpio_source> is a .cpio file it will be used If <cpio_source> is a .cpio file it will be used
as direct input to initramfs. as direct input to initramfs.
-d Output the default cpio list. -d Output the default cpio list.
@ -36,6 +36,12 @@ to reset the root/group mapping.
EOF EOF
} }
# awk style field access
# $1 - field number; rest is argument string
field() {
shift $1 ; echo $1
}
list_default_initramfs() { list_default_initramfs() {
# echo usr/kinit/kinit # echo usr/kinit/kinit
: :
@ -119,22 +125,17 @@ parse() {
str="${ftype} ${name} ${location} ${str}" str="${ftype} ${name} ${location} ${str}"
;; ;;
"nod") "nod")
local dev_type= local dev=`LC_ALL=C ls -l "${location}"`
local maj=$(LC_ALL=C ls -l "${location}" | \ local maj=`field 5 ${dev}`
gawk '{sub(/,/, "", $5); print $5}') local min=`field 6 ${dev}`
local min=$(LC_ALL=C ls -l "${location}" | \ maj=${maj%,}
gawk '{print $6}')
if [ -b "${location}" ]; then [ -b "${location}" ] && dev="b" || dev="c"
dev_type="b"
else str="${ftype} ${name} ${str} ${dev} ${maj} ${min}"
dev_type="c"
fi
str="${ftype} ${name} ${str} ${dev_type} ${maj} ${min}"
;; ;;
"slink") "slink")
local target=$(LC_ALL=C ls -l "${location}" | \ local target=`field 11 $(LC_ALL=C ls -l "${location}")`
gawk '{print $11}')
str="${ftype} ${name} ${target} ${str}" str="${ftype} ${name} ${target} ${str}"
;; ;;
*) *)

34
scripts/makelst
View file

@ -1,31 +1,31 @@
#!/bin/bash #!/bin/sh
# A script to dump mixed source code & assembly # A script to dump mixed source code & assembly
# with correct relocations from System.map # with correct relocations from System.map
# Requires the following lines in Rules.make. # Requires the following lines in makefile:
# Author(s): DJ Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
# William Stearns <wstearns@pobox.com>
#%.lst: %.c #%.lst: %.c
# $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -g -c -o $*.o $< # $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -g -c -o $*.o $<
# $(TOPDIR)/scripts/makelst $*.o $(TOPDIR)/System.map $(OBJDUMP) # $(srctree)/scripts/makelst $*.o $(objtree)/System.map $(OBJDUMP)
# #
# Copyright (C) 2000 IBM Corporation # Copyright (C) 2000 IBM Corporation
# Author(s): DJ Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com) # Author(s): DJ Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
# William Stearns <wstearns@pobox.com>
# #
t1=`$3 --syms $1 | grep .text | grep " F " | head -n 1` # awk style field access
field() {
shift $1 ; echo $1
}
t1=`$3 --syms $1 | grep .text | grep -m1 " F "`
if [ -n "$t1" ]; then if [ -n "$t1" ]; then
t2=`echo $t1 | gawk '{ print $6 }'` t2=`field 6 $t1`
if [ ! -r $2 ]; then if [ ! -r $2 ]; then
echo "No System.map" >&2 echo "No System.map" >&2
t7=0
else else
t3=`grep $t2 $2` t3=`grep $t2 $2`
t4=`echo $t3 | gawk '{ print $1 }'` t4=`field 1 $t3`
t5=`echo $t1 | gawk '{ print $1 }'` t5=`field 1 $t1`
t6=`echo $t4 - $t5 | tr a-f A-F` t6=`printf "%lu" $((0x$t4 - 0x$t5))`
t7=`( echo ibase=16 ; echo $t6 ) | bc`
fi fi
else
t7=0
fi fi
$3 -r --source --adjust-vma=$t7 $1 $3 -r --source --adjust-vma=${t6:-0} $1