From 688cdecffe140b9829da4860054d8a656ca585a7 Mon Sep 17 00:00:00 2001 From: Markham Date: Thu, 19 Nov 2015 18:50:31 +0100 Subject: [PATCH] rootfs.mk: let's work with oldroot --- make/flashimage.mk | 2 ++ make/rootfs.mk | 40 ++-------------------------------------- 2 files changed, 4 insertions(+), 38 deletions(-) diff --git a/make/flashimage.mk b/make/flashimage.mk index b57c7b0..98ce335 100755 --- a/make/flashimage.mk +++ b/make/flashimage.mk @@ -1,6 +1,7 @@ # Custom Flash Makefile flash: $(D)/flashcp + rm -f $(BUILD_TMP)/rootfs/oldroot if [ $(PLATFORM) = "apollo" ]; then \ cd $(BUILD_TMP)/rootfs && \ cp -f $(BUILD_TMP)/rootfs/etc/init.d/update.sh $(BUILD_TMP)/update.sh && \ @@ -94,6 +95,7 @@ flash-check-kronos: fi flash-full: + rm -f $(BUILD_TMP)/rootfs/oldroot if [ $(PLATFORM) = "apollo" ]; then \ cd $(BUILD_TMP)/rootfs && \ cp -f $(BUILD_TMP)/rootfs/sbin/devtable $(BUILD_TMP)/devtable && \ diff --git a/make/rootfs.mk b/make/rootfs.mk index 56bb253..ac21658 100755 --- a/make/rootfs.mk +++ b/make/rootfs.mk @@ -5,8 +5,9 @@ BOX = $(BUILD_TMP)/rootfs $(D)/rootfs: rm -rf $(BOX) cp -a $(TARGETPREFIX) $(BOX) + mkdir -p $(BOX)/oldroot rm -rf $(BOX)/include $(BOX)/mymodules - rm -rf $(BOX)/share/{aclocal,gdb,locale} # locale not (yet) needed by anything + rm -rf $(BOX)/share/{aclocal,gdb,locale,doc} # locale not (yet) needed by anything rm -rf $(BOX)/lib/pkgconfig rm -f $(BOX)/lib/libvorbisenc* if [ $(PLATFORM) = "apollo" ]; then \ @@ -17,43 +18,6 @@ $(D)/rootfs: rm -rf $(BOX)/etc/init.d/rcS; \ cp -a $(BOX)/etc/init.d/rcS-kernel-2.6.34.14-cnxt $(BOX)/etc/init.d/rcS; \ rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.34.14-cnxt; \ - else \ - if [ $(CST_KERNEL_VERSION) = "2.6.26.8" ]; then \ - rm -rf $(BOX)/etc/init.d/rcS; \ - cp -a $(BOX)/etc/init.d/rcS-kernel-2.6.26.8-cnxt $(BOX)/etc/init.d/rcS; \ - rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.26.8-cnxt; \ - rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.34.13-cnxt; \ - rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.35.14-cnxt; \ - rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.39.4-cnxt; \ - elif [ $(CST_KERNEL_VERSION) = "2.6.34.13" ]; then \ - rm -rf $(BOX)/etc/init.d/rcS; \ - cp -a $(BOX)/etc/init.d/rcS-kernel-2.6.34.13-cnxt $(BOX)/etc/init.d/rcS; \ - rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.26.8-cnxt; \ - rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.34.13-cnxt; \ - rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.35.14-cnxt; \ - rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.39.4-cnxt; \ - elif [ $(CST_KERNEL_VERSION) = "2.6.35.14" ]; then \ - rm -rf $(BOX)/etc/init.d/rcS; \ - cp -a $(BOX)/etc/init.d/rcS-kernel-2.6.35.14-cnxt $(BOX)/etc/init.d/rcS; \ - rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.26.8-cnxt; \ - rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.34.13-cnxt; \ - rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.35.14-cnxt; \ - rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.39.4-cnxt; \ - elif [ $(CST_KERNEL_VERSION) = "2.6.39.4" ]; then \ - rm -rf $(BOX)/etc/init.d/rcS; \ - cp -a $(BOX)/etc/init.d/rcS-kernel-2.6.39.4-cnxt $(BOX)/etc/init.d/rcS; \ - rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.26.8-cnxt; \ - rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.34.13-cnxt; \ - rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.35.14-cnxt; \ - rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.39.4-cnxt; \ - else \ - rm -rf $(BOX)/etc/init.d/rcS; \ - cp -a $(BOX)/etc/init.d/rcS-kernel-2.6.34.13-cnxt $(BOX)/etc/init.d/rcS; \ - rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.26.8-cnxt; \ - rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.34.13-cnxt; \ - rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.35.14-cnxt; \ - rm -rf $(BOX)/etc/init.d/rcS-kernel-2.6.39.4-cnxt; \ - fi; \ fi find $(BOX) -name .gitignore -type f -print0 | xargs --no-run-if-empty -0 rm -f find $(BOX)/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs --no-run-if-empty -0 rm -f -- 2.39.5