From cf26510ea73d96e9692af496d4c8486039f34417 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Wed, 29 Jul 2015 19:19:58 -0700
Subject: [PATCH] check_root: update ignore list for arm64, make error
 non-fatal

---
 build_library/check_root            | 30 ++++++++++++++++++++++++++---
 build_library/test_image_content.sh |  2 +-
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/build_library/check_root b/build_library/check_root
index b56f5dfd38..ad5f83d7a9 100755
--- a/build_library/check_root
+++ b/build_library/check_root
@@ -19,11 +19,35 @@ VARDB = portage.db[portage.root]["vartree"].dbapi
 # TODO(marneam): possibly accept globs for arch and sonames
 IGNORE_MISSING = {
     # /usr/lib/go/src/debug/elf/testdata/gcc-386-freebsd-exec
-    "dev-lang/go":              [SonameAtom("x86_32", "libc.so.6")],
-    "dev-lang/go-bootstrap":    [SonameAtom("x86_32", "libc.so.6")],
+    # /usr/lib/go/src/debug/elf/testdata/gcc-amd64-linux-exec
+    "dev-lang/go":              [SonameAtom("x86_32", "libc.so.6"),
+                                 SonameAtom("x86_64", "libc.so.6")],
+    "dev-lang/go-bootstrap":    [SonameAtom("x86_32", "libc.so.6"),
+                                 SonameAtom("x86_64", "libc.so.6")],
 
     # https://bugs.gentoo.org/show_bug.cgi?id=554582
-    "net-firewall/ebtables":    [SonameAtom("x86_64", "libebt_802_3.so"),
+    "net-firewall/ebtables":    [SonameAtom("arm_64", "libebt_802_3.so"),
+                                 SonameAtom("arm_64", "libebt_among.so"),
+                                 SonameAtom("arm_64", "libebt_arp.so"),
+                                 SonameAtom("arm_64", "libebt_arpreply.so"),
+                                 SonameAtom("arm_64", "libebt_ip.so"),
+                                 SonameAtom("arm_64", "libebt_ip6.so"),
+                                 SonameAtom("arm_64", "libebt_limit.so"),
+                                 SonameAtom("arm_64", "libebt_log.so"),
+                                 SonameAtom("arm_64", "libebt_mark.so"),
+                                 SonameAtom("arm_64", "libebt_mark_m.so"),
+                                 SonameAtom("arm_64", "libebt_nat.so"),
+                                 SonameAtom("arm_64", "libebt_nflog.so"),
+                                 SonameAtom("arm_64", "libebt_pkttype.so"),
+                                 SonameAtom("arm_64", "libebt_redirect.so"),
+                                 SonameAtom("arm_64", "libebt_standard.so"),
+                                 SonameAtom("arm_64", "libebt_stp.so"),
+                                 SonameAtom("arm_64", "libebt_ulog.so"),
+                                 SonameAtom("arm_64", "libebt_vlan.so"),
+                                 SonameAtom("arm_64", "libebtable_broute.so"),
+                                 SonameAtom("arm_64", "libebtable_filter.so"),
+                                 SonameAtom("arm_64", "libebtable_nat.so"),
+                                 SonameAtom("x86_64", "libebt_802_3.so"),
                                  SonameAtom("x86_64", "libebt_among.so"),
                                  SonameAtom("x86_64", "libebt_arp.so"),
                                  SonameAtom("x86_64", "libebt_arpreply.so"),
diff --git a/build_library/test_image_content.sh b/build_library/test_image_content.sh
index 1b769dbd38..e1856f0d60 100644
--- a/build_library/test_image_content.sh
+++ b/build_library/test_image_content.sh
@@ -14,7 +14,7 @@ test_image_content() {
     warn "packages that predate portage 2.2.18. If this is the case try:"
     echo "    emerge-$BOARD -agkuDN --rebuilt-binaries=y -j9  @world"
     echo "    emerge-$BOARD -a --depclean"
-    returncode=1
+    #returncode=1
   fi
 
   local blacklist_dirs=(