rootfs-strip-list: make it more accurate

To fix issue -bash: /usr/sbin/chroot: No such file or directory Signed-off-by: Fengguang Wu <[email protected]>
kulong0105 · Aug 31, 2016 · 9ecff78 · 9ecff78
1 parent 594e515
commit 9ecff78
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 23 deletions.
diff --git a/rootfs/create-cpio.sh b/rootfs/create-cpio.sh
@@ -9,7 +9,8 @@ cd $distro || exit
 
 cpio_file=$distro-$(date +%F).cgz
 
-{ find . -xdev; find dev; } |
+find . -xdev |
+sed 's,^\./,,' |
 grep -v -f ../rootfs-strip-list |
 cpio -o -H newc | gzip -n -9 > ../$cpio_file || exit
 

diff --git a/rootfs/rootfs-strip-list b/rootfs/rootfs-strip-list
@@ -1,25 +1,27 @@
-root
-usr/doc
-usr/man
-usr/info
-usr/share/doc
-usr/share/man
-usr/share/info
-usr/share/i18n
-usr/share/locale
-usr/share/zoneinfo
-usr/share/terminfo/[^lrxstv]
-usr/share/calendar
-usr/share/common-licenses
-usr/lib/x86_64-linux-gnu/gconv
-tmp/...
+^root/
+^proc/
+^sys/
+^dev/
+^usr/doc
+^usr/man
+^usr/info
+^usr/share/doc
+^usr/share/man
+^usr/share/info
+^usr/share/i18n
+^usr/share/locale
+^usr/share/zoneinfo
+^usr/share/terminfo/[^lrxstv]
+^usr/share/calendar
+^usr/share/common-licenses
+^usr/lib/x86_64-linux-gnu/gconv
+^tmp/...
 /\.git/
 /\.debug/
 /\.zcomp...
-var/lib/apt/lists/...
-var/lib/dpkg/info/...
-var/lib/dpkg/available
-var/lib/dpkg/.*-old
-var/log/.*/...
-var/log/.*log
-var/cache/.*/...
+^var/lib/apt/lists/...
+^var/lib/dpkg/info/...
+^var/lib/dpkg/.*-old
+^var/log/.*/...
+^var/log/.*log
+^var/cache/.*/...