Skip to content
Snippets Groups Projects
Commit 5ee65cb1 authored by Christopher Spinrath's avatar Christopher Spinrath
Browse files

Move the patch_all call from remaster_rootfs to the Makefile

Now rootfs patches are applied on the host (and not inside the remaster
container). Thus, _all_ patches are applied on the host.
As a side effect the assumption that "patch" is installed in the
ubuntu rootfs is removed.
parent faaaeda3
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
../../patches/rootfs
\ No newline at end of file
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment