Commit cc3c350b authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Tim Gardner

UBUNTU: [Debian] Explicitly reference gawk in build rules awk in all and arch

Explicitly reference gawk in all rules files. Fixes FTBS on the buildds.
Signed-off-by: default avatarAndy Whitcroft <apw@canonical.com>
Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
parent 1c0ba34f
...@@ -90,7 +90,7 @@ printenv: ...@@ -90,7 +90,7 @@ printenv:
printchanges: printchanges:
@baseCommit=$$(git log --pretty=format:'%H %s' | \ @baseCommit=$$(git log --pretty=format:'%H %s' | \
awk '/UBUNTU: '".*Ubuntu-$(prev_fullver)"'$$/ { print $$1; exit }'); \ gawk '/UBUNTU: '".*Ubuntu-$(prev_fullver)"'$$/ { print $$1; exit }'); \
git log "$$baseCommit"..HEAD | \ git log "$$baseCommit"..HEAD | \
perl -w -f $(DROOT)/scripts/misc/git-ubuntu-log $(ubuntu_log_opts) perl -w -f $(DROOT)/scripts/misc/git-ubuntu-log $(ubuntu_log_opts)
...@@ -102,7 +102,7 @@ diffupstream: ...@@ -102,7 +102,7 @@ diffupstream:
startnewrelease: startnewrelease:
dh_testdir dh_testdir
@nextminor=$(shell expr `echo $(revision) | awk -F. '{print $$2}'` + 1); \ @nextminor=$(shell expr `echo $(revision) | gawk -F. '{print $$2}'` + 1); \
now="$(shell date -R)"; \ now="$(shell date -R)"; \
echo "Creating new changelog set for $(abi_release).$$nextminor..."; \ echo "Creating new changelog set for $(abi_release).$$nextminor..."; \
echo -e "$(src_pkg_name) ($(abi_release).$$nextminor) UNRELEASED; urgency=low\n" > $(DEBIAN)/changelog.new; \ echo -e "$(src_pkg_name) ($(abi_release).$$nextminor) UNRELEASED; urgency=low\n" > $(DEBIAN)/changelog.new; \
......
...@@ -87,7 +87,7 @@ ifeq ($(uefi_signed),true) ...@@ -87,7 +87,7 @@ ifeq ($(uefi_signed),true)
install -d $(signed)/$(release)-$(revision) install -d $(signed)/$(release)-$(revision)
# Check to see if this supports handoff, if not do not sign it. # Check to see if this supports handoff, if not do not sign it.
# Check the identification area magic and version >= 0x020b # Check the identification area magic and version >= 0x020b
handoff=`dd if="$(pkgdir)/boot/$(instfile)-$(abi_release)-$*" bs=1 skip=514 count=6 2>/dev/null | od -s | awk '($$1 == 0 && $$2 == 25672 && $$3 == 21362 && $$4 >= 523) { print "GOOD" }'`; \ handoff=`dd if="$(pkgdir)/boot/$(instfile)-$(abi_release)-$*" bs=1 skip=514 count=6 2>/dev/null | od -s | gawk '($$1 == 0 && $$2 == 25672 && $$3 == 21362 && $$4 >= 523) { print "GOOD" }'`; \
if [ "$$handoff" = "GOOD" ]; then \ if [ "$$handoff" = "GOOD" ]; then \
cp -p $(pkgdir)/boot/$(instfile)-$(abi_release)-$* \ cp -p $(pkgdir)/boot/$(instfile)-$(abi_release)-$* \
$(signed)/$(release)-$(revision)/$(instfile)-$(abi_release)-$*.efi; \ $(signed)/$(release)-$(revision)/$(instfile)-$(abi_release)-$*.efi; \
......
...@@ -14,7 +14,7 @@ do-binary-udebs: debian/control ...@@ -14,7 +14,7 @@ do-binary-udebs: debian/control
# unpack the kernels into a temporary directory # unpack the kernels into a temporary directory
mkdir -p debian/d-i-${arch} mkdir -p debian/d-i-${arch}
imagelist=$$(cat $(builddir)/kernel-versions | grep ^${arch} | awk '{print $$4}') && \ imagelist=$$(cat $(builddir)/kernel-versions | grep ^${arch} | gawk '{print $$4}') && \
for i in $$imagelist; do \ for i in $$imagelist; do \
dpkg -x $$(ls ../linux-image-$$i\_$(release)-$(revision)_${arch}.deb) \ dpkg -x $$(ls ../linux-image-$$i\_$(release)-$(revision)_${arch}.deb) \
debian/d-i-${arch}; \ debian/d-i-${arch}; \
...@@ -44,7 +44,7 @@ do-binary-udebs: debian/control ...@@ -44,7 +44,7 @@ do-binary-udebs: debian/control
done done
# Generate the meta-udeb dependancy lists. # Generate the meta-udeb dependancy lists.
@awk ' \ @gawk ' \
/Package: / { package=$$2 } \ /Package: / { package=$$2 } \
(/Package-Type: udeb/ && package !~ /^'$(src_pkg_name)'-udebs-/) { \ (/Package-Type: udeb/ && package !~ /^'$(src_pkg_name)'-udebs-/) { \
match(package, "'$(release)'-'$(abinum)'-(.*)-di", bits); \ match(package, "'$(release)'-'$(abinum)'-(.*)-di", bits); \
......
...@@ -11,7 +11,7 @@ fi ...@@ -11,7 +11,7 @@ fi
ver=$1 ver=$1
revision=$2 revision=$2
abi=$(echo $revision | awk -F. '{print $1}') abi=$(echo $revision | gawk -F. '{print $1}')
verabi=$ver-$abi verabi=$ver-$abi
verfull=$ver-$revision verfull=$ver-$revision
...@@ -82,7 +82,7 @@ getall() { ...@@ -82,7 +82,7 @@ getall() {
# exposed when using the `find ...` form of the command. # exposed when using the `find ...` form of the command.
ko=$(find lib/modules/$verabi-$sub/kernel \ ko=$(find lib/modules/$verabi-$sub/kernel \
-name '*.ko' | head -1) -name '*.ko' | head -1)
readelf -p .comment "$ko" | awk ' readelf -p .comment "$ko" | gawk '
($1 == "[") { ($1 == "[") {
printf("%s", $3); printf("%s", $3);
for (n=4; n<=NF; n++) { for (n=4; n<=NF; n++) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment