diff --git a/Makefile b/Makefile index de48a69fa195e9b30a77b7150e1a5b58b80fdd2a..6600661fcf2da5c48777cb72e277028e5168d66a 100644 --- a/Makefile +++ b/Makefile @@ -184,6 +184,9 @@ $(call gentargets,$(STATE_DIR)/rootfs_remastered) : $(call archdir,%)$(STATE_DIR -s lxc.mount.entry="none $(call archdir,$*)$(ROOTFS)/run tmpfs defaults 0 0" \ -- /bin/bash -l /remaster/remaster.proxy.sh /remaster/scripts/remaster_rootfs.sh $(MAKE) ARCH=$* rootfs_finalize + + #apply patches + $(call patch_all,$(CURDIR)/patches/rootfs,$(call archdir,$*)$(ROOTFS)) touch "$(call archdir,$*)$(STATE_DIR)/rootfs_remastered" rootfs_console : $(call archdir,$(ARCH))$(STATE_DIR)/rootfs_extracted | $(APT_CACHE_DIR) diff --git a/config/copy_to_rootfs_remaster_dir/patches b/config/copy_to_rootfs_remaster_dir/patches deleted file mode 120000 index cc06b73e907c4c3d5e4d608d1ee80dd77688b496..0000000000000000000000000000000000000000 --- a/config/copy_to_rootfs_remaster_dir/patches +++ /dev/null @@ -1 +0,0 @@ -../../patches/rootfs \ No newline at end of file diff --git a/scripts/remaster_rootfs.sh b/scripts/remaster_rootfs.sh index 3a674694e610192e87e80031fcd06c755b9120bd..0db90638ec78c9e5334212d09e9d0246d4c8c7bb 100755 --- a/scripts/remaster_rootfs.sh +++ b/scripts/remaster_rootfs.sh @@ -149,9 +149,6 @@ install_packages install_kde_defaults -#patch rootfs -patch_all "$SCRIPT_DIR/patches/" "/" - #i.e. required for applying default-wallpaper patch #echo "compiling glib2 schemas..." #glib-compile-schemas /usr/share/glib-2.0/schemas