[PATCH] kbuild scripts: replace gawk, head, bc with shell, update (f6112ec2) · Commits · 戴 / test

scripts/gen_initramfs_list.sh

+22 −21

Original line number	Diff line number	Diff line
		#!/bin/bash
		# 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
		#
		@@ -36,6 +36,12 @@ to reset the root/group mapping.
		EOF
		}

		# awk style field access
		# $1 - field number; rest is argument string
		field() {
		shift $1 ; echo $1
		}

		list_default_initramfs() {
		# echo usr/kinit/kinit
		:
		@@ -119,22 +125,17 @@ parse() {
		str="${ftype} ${name} ${location} ${str}"
		;;
		"nod")
		local dev_type=
		local maj=$(LC_ALL=C ls -l "${location}" \| \
		gawk '{sub(/,/, "", $5); print $5}')
		local min=$(LC_ALL=C ls -l "${location}" \| \
		gawk '{print $6}')

		if [ -b "${location}" ]; then
		dev_type="b"
		else
		dev_type="c"
		fi
		str="${ftype} ${name} ${str} ${dev_type} ${maj} ${min}"
		local dev=`LC_ALL=C ls -l "${location}"`
		local maj=`field 5 ${dev}`
		local min=`field 6 ${dev}`
		maj=${maj%,}

		[ -b "${location}" ] && dev="b" \|\| dev="c"

		str="${ftype} ${name} ${str} ${dev} ${maj} ${min}"
		;;
		"slink")
		local target=$(LC_ALL=C ls -l "${location}" \| \
		gawk '{print $11}')
		local target=`field 11 $(LC_ALL=C ls -l "${location}")`
		str="${ftype} ${name} ${target} ${str}"
		;;
		*)

+17 −17

Original line number	Diff line number	Diff line
		#!/bin/bash
		#!/bin/sh
		# A script to dump mixed source code & assembly
		# with correct relocations from System.map
		# Requires the following lines in Rules.make.
		# Author(s): DJ Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
		# William Stearns <wstearns@pobox.com>
		# Requires the following lines in makefile:
		#%.lst: %.c
		# $(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
		# 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
		t2=`echo $t1 \| gawk '{ print $6 }'`
		t2=`field 6 $t1`
		if [ ! -r $2 ]; then
		echo "No System.map" >&2
		t7=0
		else
		t3=`grep $t2 $2`
		t4=`echo $t3 \| gawk '{ print $1 }'`
		t5=`echo $t1 \| gawk '{ print $1 }'`
		t6=`echo $t4 - $t5 \| tr a-f A-F`
		t7=`( echo ibase=16 ; echo $t6 ) \| bc`
		t4=`field 1 $t3`
		t5=`field 1 $t1`
		t6=`printf "%lu" $((0x$t4 - 0x$t5))`
		fi
		else
		t7=0
		fi
		$3 -r --source --adjust-vma=$t7 $1
		$3 -r --source --adjust-vma=${t6:-0} $1