diff options
| author | Robert Moore <Robert.Moore@intel.com> | 2012-07-13 10:22:24 -0700 |
|---|---|---|
| committer | Robert Moore <Robert.Moore@intel.com> | 2012-07-13 10:22:24 -0700 |
| commit | ff065138805d2e2875130fa8062260e7bd0fbf25 (patch) | |
| tree | 457a25620ee4d91f50811265ac7af2202bebcecf | |
| parent | 91948ecb228d24ad2d3ff0024f441f7ec792e8ba (diff) | |
| download | acpica-ff065138805d2e2875130fa8062260e7bd0fbf25.tar.gz | |
Update Linux/ACPICA divergence script.
Ensure operation on multiple types of hosts.
| -rwxr-xr-x[-rw-r--r--] | generate/linux/divergence.sh | 14 | ||||
| -rw-r--r-- | generate/unix/Makefile.common | 5 |
2 files changed, 10 insertions, 9 deletions
diff --git a/generate/linux/divergence.sh b/generate/linux/divergence.sh index 7438f88ac..444c3e4c2 100644..100755 --- a/generate/linux/divergence.sh +++ b/generate/linux/divergence.sh @@ -35,7 +35,7 @@ ACPISRC=${ACPICA}/generate/unix/acpisrc/obj32/acpisrc # # Copy the actual Linux ACPICA files locally # -echo "Create local Linux ACPICA files subdirectory" +echo "Creating local Linux ACPICA files subdirectory" rm -rf $ACPICA_TMP $LINUX_ACPICA $ACPICA_LINUXIZED mkdir $ACPICA_TMP $LINUX_ACPICA @@ -67,20 +67,20 @@ $ACPISRC -ldqy $ACPICA_TMP $ACPICA_LINUXIZED # # Enable cross platform generation # -d2u -q $LINDENT -d2u -q $ACPICA_LINUXIZED/* -d2u -q $LINUX_ACPICA/* +dos2unix -q $LINDENT +dos2unix -q $ACPICA_LINUXIZED/* +dos2unix -q $LINUX_ACPICA/* # # Lindent both sets of files # -echo "Build lindented linuxized ACPICA files" +echo "Building lindented linuxized ACPICA files" cd $ACPICA_LINUXIZED find . -name "*.[ch]" | xargs $LINDENT rm -f *~ cd .. -echo "Build lindented actual linux ACPICA files" +echo "Building lindented actual linux ACPICA files" cd $LINUX_ACPICA find . -name "*.[ch]" | xargs $LINDENT rm -f *~ @@ -89,7 +89,7 @@ cd .. # # Now we can finally do the big diff # -echo "Create ACPICA/Linux diff" +echo "Creating ACPICA/Linux diff" diff -E -b -w -B -rpuN $LINUX_ACPICA $ACPICA_LINUXIZED > divergence.diff ls -l divergence.diff diff --git a/generate/unix/Makefile.common b/generate/unix/Makefile.common index 23baf4230..0670fbb8a 100644 --- a/generate/unix/Makefile.common +++ b/generate/unix/Makefile.common @@ -7,6 +7,7 @@ # string will be treated as a 64-bit OS. Otherwise, the default is 32-bit. # HARDWARE_NAME := $(shell uname -m) +BITS=0 # # Main rule will only generate versions that are appropriate for the running @@ -15,8 +16,8 @@ HARDWARE_NAME := $(shell uname -m) all: ${PROGS} ${PROGS}: FORCE @cd $(BUILD_DIRECTORY_PATH)/$@; \ - if [ "$(BITS)" == "32" ]; then \ - echo "Forced 32-bit generation"; \ + if [ $(BITS) -eq 32 ]; then \ + echo "Forced 32-bit generation of $@"; \ mkdir -p obj32; \ make BITS=32; \ echo "32-bit version of $@:"; \ |