From 63eb1750f19b7ec9c64a9aba3fe7b307be9e497a Mon Sep 17 00:00:00 2001 From: Dmitry Pyzhov Date: Fri, 14 Jun 2013 17:40:35 +0400 Subject: [PATCH] Fix echo of newlines --- bootstrap/module.mk | 2 +- mirror/centos/repo.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrap/module.mk b/bootstrap/module.mk index 0d4d8bade..4a1f31837 100644 --- a/bootstrap/module.mk +++ b/bootstrap/module.mk @@ -97,7 +97,7 @@ $(BUILD_DIR)/bootstrap/etc/yum.conf: export contents:=$(bootstrap_yum_conf) $(BUILD_DIR)/bootstrap/etc/yum.repos.d/base.repo: export contents:=$(yum_local_repo) $(BUILD_DIR)/bootstrap/etc/yum.conf $(BUILD_DIR)/bootstrap/etc/yum.repos.d/base.repo: mkdir -p $(@D) - echo "$${contents}" > $@ + /bin/echo -e "$${contents}" > $@ $(BUILD_DIR)/bootstrap/customize-initram-root.done: $(call depv,BOOTSTRAP_RPMS_CUSTOM) $(BUILD_DIR)/bootstrap/customize-initram-root.done: \ diff --git a/mirror/centos/repo.mk b/mirror/centos/repo.mk index a70b865a1..a8d51dd28 100644 --- a/mirror/centos/repo.mk +++ b/mirror/centos/repo.mk @@ -6,7 +6,7 @@ $(BUILD_DIR)/mirror/centos/etc/yum.conf: $(call depv,yum_conf) $(BUILD_DIR)/mirror/centos/etc/yum.conf: export contents:=$(yum_conf) $(BUILD_DIR)/mirror/centos/etc/yum.conf: mkdir -p $(@D) - echo "$${contents}" > $@ + /bin/echo -e "$${contents}" > $@ $(BUILD_DIR)/mirror/centos/etc/yum-plugins/priorities.py: \ $(SOURCE_DIR)/mirror/centos/yum-priorities-plugin.py @@ -15,14 +15,14 @@ $(BUILD_DIR)/mirror/centos/etc/yum-plugins/priorities.py: \ $(BUILD_DIR)/mirror/centos/etc/yum/pluginconf.d/priorities.conf: mkdir -p $(@D) - echo "[main]\nenabled=1\ncheck_obsoletes=1\nfull_match=1" > $@ + /bin/echo -e "[main]\nenabled=1\ncheck_obsoletes=1\nfull_match=1" > $@ $(BUILD_DIR)/mirror/centos/etc/yum.repos.d/base.repo: $(call depv,YUM_REPOS) $(BUILD_DIR)/mirror/centos/etc/yum.repos.d/base.repo: \ export contents:=$(foreach repo,$(YUM_REPOS),\n$(yum_repo_$(repo))\n) $(BUILD_DIR)/mirror/centos/etc/yum.repos.d/base.repo: @mkdir -p $(@D) - echo "$${contents}" > $@ + /bin/echo -e "$${contents}" > $@ $(BUILD_DIR)/mirror/centos/yum-config.done: \ $(BUILD_DIR)/mirror/centos/etc/yum.conf \