Changeset 169 for debwrt/trunk/debian/buildenv/debian.mk

Timestamp:

Feb 19, 2011, 11:36:21 PM (12 years ago)

Author:

amain

Message:

debian/buildenv: apt-cross now only availabe from lenny. Fixes ticket #84.

File:

• debwrt/trunk/debian/buildenv/debian.mk (modified) (1 diff)

debwrt/trunk/debian/buildenv/debian.mk

@@ -89 +89 @@
 debian/buildenv/emdebian-prepare: debian/buildenv/prepare
         sudo bash -c "echo \"deb $(call qstrip,$(CONFIG_EMDEBIAN_BUILDENV_REPOSITORY)) $(EMDEBIAN_RELEASE) main\" >> $(DEBIAN_BUILD_DIR)/etc/apt/sources.list"
-ifeq ($(DEBIAN_BUILD_VERSION),sid)
+        # Add lenny repo, just for apt-cross
+        sudo bash -c "echo \"deb $(call qstrip,$(CONFIG_DEBIAN_BUILDENV_REPOSITORY)) lenny main\" >> $(DEBIAN_BUILD_DIR)/etc/apt/sources.list"
+        #sudo bash -c "echo -e \"Package: *\nPin: release a=lenny\nPin-Priority: 200\" > $(DEBIAN_BUILD_DIR)/etc/apt/preferences"
         sudo chroot $(DEBIAN_BUILD_DIR) apt-get update
-        sudo chroot $(DEBIAN_BUILD_DIR) bash -c "export LC_ALL=C; apt-get -y --force-yes install build-essential debootstrap fakeroot zlib1g-dev dh-make openssh-client dpkg-cross apt-cross vim pkg-config dpatch libncurses5-dev devscripts subversion automake gcc-multilib g++-multilib"
-else
-        sudo bash -c "echo \"deb $(call qstrip,$(CONFIG_DEBIAN_BUILDENV_REPOSITORY)) sid main\" >> $(DEBIAN_BUILD_DIR)/etc/apt/sources.list"
-        sudo bash -c "echo -e \"Package: *\nPin: release a=sid\nPin-Priority: 200\" > $(DEBIAN_BUILD_DIR)/etc/apt/preferences"
-        sudo chroot $(DEBIAN_BUILD_DIR) apt-get update
-        sudo chroot $(DEBIAN_BUILD_DIR) apt-get -y install -t sid apt-cross libmpfr1ldbl
+        sudo chroot $(DEBIAN_BUILD_DIR) apt-get -y install apt-cross
+        sudo chroot $(DEBIAN_BUILD_DIR) apt-get -y install libmpfr1ldbl
         sudo chroot $(DEBIAN_BUILD_DIR) bash -c "export LC_ALL=C; apt-get -y --force-yes install build-essential debootstrap fakeroot zlib1g-dev dh-make openssh-client dpkg-cross vim pkg-config dpatch libncurses5-dev devscripts subversion automake gcc-multilib g++-multilib"
-endif
         sudo chroot $(DEBIAN_BUILD_DIR) bash -c "export LC_ALL=C; apt-get -y --force-yes install libc6-$(TARGET_ARCH)-cross libc6-dev-$(TARGET_ARCH)-cross binutils-$(TARGET_ARCH)-linux-gnu gcc-4.3-$(TARGET_ARCH)-linux-gnu g++-4.3-$(TARGET_ARCH)-linux-gnu linux-kernel-headers-$(TARGET_ARCH)-cross"
         touch $@