Merge branch 'thingos' into dev

bortek · Aug 26, 2017 · 5ee1a05 · 5ee1a05
2 parents 5d4cad5 + 2979270
commit 5ee1a05
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 1 deletion.
diff --git a/board/common/cleanups.sh b/board/common/cleanups.sh
@@ -5,7 +5,7 @@ if [ -z "$TARGET" ]; then
     exit 1
 fi
 
-rm -f $TARGET/boot/.gitkeep
+find $TARGET -name '.empty' | xargs -r rm
 
 # /etc stuff
 rm -rf $TARGET/etc/network/

diff --git a/board/common/overlay/etc/adminpasswd.d/.keep → ...d/common/overlay/etc/adminpasswd.d/.empty b/board/common/overlay/etc/adminpasswd.d/.keep → ...d/common/overlay/etc/adminpasswd.d/.empty
diff --git a/...mmon/overlay/usr/share/dataskel/etc/.keep → ...mon/overlay/usr/share/dataskel/etc/.empty b/...mmon/overlay/usr/share/dataskel/etc/.keep → ...mon/overlay/usr/share/dataskel/etc/.empty
diff --git a/...mmon/overlay/usr/share/dataskel/log/.keep → ...mon/overlay/usr/share/dataskel/log/.empty b/...mmon/overlay/usr/share/dataskel/log/.keep → ...mon/overlay/usr/share/dataskel/log/.empty
diff --git a/...on/overlay/usr/share/dataskel/media/.keep → ...n/overlay/usr/share/dataskel/media/.empty b/...on/overlay/usr/share/dataskel/media/.keep → ...n/overlay/usr/share/dataskel/media/.empty
diff --git a/...n/overlay/usr/share/dataskel/varlib/.keep → .../overlay/usr/share/dataskel/varlib/.empty b/...n/overlay/usr/share/dataskel/varlib/.keep → .../overlay/usr/share/dataskel/varlib/.empty