diff --git a/Makefile b/Makefile index 8d7867e268b16f141548d2588c20d9b1942ab836..eed2e4652e8e9cf71fdcba2e133c50e6b9cf5a43 100644 --- a/Makefile +++ b/Makefile @@ -178,6 +178,15 @@ $(call gentargets,$(STATE_DIR)/rootfs_prepared) : $(call archdir,%)$(STATE_DIR)/ rootfs_remaster : $(ARCH_DIR)$(STATE_DIR)/rootfs_remastered $(call gentargets,$(STATE_DIR)/rootfs_remastered) : $(call archdir,%)$(STATE_DIR)/rootfs_extracted | $(APT_CACHE_DIR) $(MAKE) ARCH=$* rootfs_prepare +ifneq($(strip $(APT_SOURCE_URL_OVERRIDE)),) + #override apt sources list + echo "deb $(APT_SOURCE_URL_OVERRIDE) $(ISO_RELEASE) main restricted universe multiverse" \ + > "$(call archdir,$*)$(ROOTFS)/etc/apt/sources.list" + echo "deb $(APT_SOURCE_URL_OVERRIDE) $(ISO_RELEASE)-security main restricted universe multiverse" \ + >> "$(call archdir,$*)$(ROOTFS)/etc/apt/sources.list" + echo "deb $(APT_SOURCE_URL_OVERRIDE) $(ISO_RELEASE)-updates main restricted universe multiverse" \ + >> "$(call archdir,$*)$(ROOTFS)/etc/apt/sources.list" +endif mkdir -p "$(call archdir,$*)$(LXC_DIR)" lxc-execute --name "lipck_remaster_$*" -P "$(call archdir,$*)$(LXC_DIR)" -f "$(CURDIR)/config/lxc_common.conf" \ -s lxc.arch="$*" -s lxc.rootfs="$(call archdir,$*)$(ROOTFS)" \ diff --git a/config/Makefile.conf.defaults b/config/Makefile.conf.defaults index 6fdb84775f3ec0699b1534eee7b55a05e398e725..cafd98b28866030334b16ca498296763d67984e8 100644 --- a/config/Makefile.conf.defaults +++ b/config/Makefile.conf.defaults @@ -27,6 +27,8 @@ ISO_VERSION=14.04.2 ISO_FLAVOR=kubuntu ISO_PATTERN_FLAGS= +APT_SOURCE_URL_OVERRIDE=http://ftp.halifax.rwth-aachen.de/ubuntu/ + IMAGE_DIR=$(WORKSPACE)/image_files/ IMAGE_GIT_URL=https://www.fsmpi.rwth-aachen.de/git/lipstick IMAGE_GIT_BRANCH=ss15 diff --git a/contrib/rootfs/lip_sources.list b/contrib/rootfs/lip_sources.list deleted file mode 100644 index 9ef2984a00a27b8c36c76c4479e1fe15fa22419b..0000000000000000000000000000000000000000 --- a/contrib/rootfs/lip_sources.list +++ /dev/null @@ -1,6 +0,0 @@ -deb http://ftp.halifax.rwth-aachen.de/ubuntu/ trusty main restricted universe multiverse -deb http://security.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse -deb http://ftp.halifax.rwth-aachen.de/ubuntu/ trusty-updates main restricted universe multiverse - -#deb http://de.archive.ubuntu.com/ubuntu/ trusty main restricted universe multiverse -#deb http://de.archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe multiverse diff --git a/scripts/rootfs_remaster.sh b/scripts/rootfs_remaster.sh index 067aaa8a2fe155614d951939943b0a39b06c7a63..5406f921fa8e23c25ef7225e9455ec7a0c49281b 100755 --- a/scripts/rootfs_remaster.sh +++ b/scripts/rootfs_remaster.sh @@ -42,10 +42,6 @@ fi function prepare_install() { - if [ -e "$CONTRIB_DIR/lip_sources.list" ]; then - cp -v "$CONTRIB_DIR/lip_sources.list" "/etc/apt/sources.list" - fi - #uncomment if newest texlive is not part of your distribution #add-apt-repository -y ppa:texlive-backports/ppa