* [Buildroot] svn commit: trunk/buildroot/package/portage
@ 2007-07-25 11:40 ulf at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: ulf at uclibc.org @ 2007-07-25 11:40 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-25 04:40:09 -0700 (Wed, 25 Jul 2007)
New Revision: 19257
Log:
Bump version of portage/sandbox to allow build
Modified:
trunk/buildroot/package/portage/portage.mk
Changeset:
Modified: trunk/buildroot/package/portage/portage.mk
===================================================================
--- trunk/buildroot/package/portage/portage.mk 2007-07-24 18:20:46 UTC (rev 19256)
+++ trunk/buildroot/package/portage/portage.mk 2007-07-25 11:40:09 UTC (rev 19257)
@@ -3,15 +3,19 @@
# portage
#
#############################################################
-PORTAGE_VERSION:=2.0.51.22
-PORTAGE_SOURCE:=portage-$(PORTAGE_VERSION).tar.bz2
+PORTAGE_DOWNLOAD_VERSION:=2.1.2
+PORTAGE_PATCH_VERSION:=.9
+PORTAGE_VERSION:=$(PORTAGE_DOWNLOAD_VERSION)$(PORTAGE_PATCH_VERSION)
+PORTAGE_PATCH:=portage-$(PORTAGE_VERSION).patch.bz2
+
+PORTAGE_SOURCE:=portage-$(PORTAGE_DOWNLOAD_VERSION).tar.bz2
PORTAGE_SITE:=http://gentoo.osuosl.org/distfiles
PORTAGE_CAT:=$(BZCAT)
PORTAGE_DIR:=$(BUILD_DIR)/portage-$(PORTAGE_VERSION)
PORTAGE_TARGET_DIR:=$(TARGET_DIR)/usr/lib/portage
PORTAGE_TARGET_BINARY:=usr/bin/emerge
-SANDBOX_VERSION:=1.2.13
+SANDBOX_VERSION:=1.2.18.1
SANDBOX_SOURCE:=sandbox-$(SANDBOX_VERSION).tar.bz2
SANDBOX_SITE:=$(PORTAGE_SITE)
SANDBOX_CAT:=$(PORTAGE_CAT)
@@ -42,6 +46,8 @@
$(DL_DIR)/$(PORTAGE_SOURCE):
$(WGET) -P $(DL_DIR) $(PORTAGE_SITE)/$(PORTAGE_SOURCE)
+$(DL_DIR)/$(PORTAGE_PATCH):
+ $(WGET) -P $(DL_DIR) $(PORTAGE_SITE)/$(PORTAGE_PATCH)
$(DL_DIR)/$(SANDBOX_SOURCE):
$(WGET) -P $(DL_DIR) $(SANDBOX_SITE)/$(SANDBOX_SOURCE)
@@ -50,17 +56,24 @@
$(PORTAGE_DIR)/.unpacked: $(DL_DIR)/$(PORTAGE_SOURCE)
$(PORTAGE_CAT) $(DL_DIR)/$(PORTAGE_SOURCE) | tar -C $(BUILD_DIR) -xf -
+ mv -f $(BUILD_DIR)/portage-$(PORTAGE_DOWNLOAD_VERSION) $(PORTAGE_DIR)
rm -f $(PORTAGE_DIR)/bin/tbz2tool
- touch $(PORTAGE_DIR)/.unpacked
+ touch $@
+
+$(PORTAGE_DIR)/.patched: $(PORTAGE_DIR)/.unpacked $(DL_DIR)/$(PORTAGE_PATCH)
+ (cd $(PORTAGE_DIR); $(PORTAGE_CAT) $(DL_DIR)/$(PORTAGE_PATCH) | patch -p0)
+ touch $@
+
$(SANDBOX_DIR)/.unpacked: $(DL_DIR)/$(SANDBOX_SOURCE)
$(SANDBOX_CAT) $(DL_DIR)/$(SANDBOX_SOURCE) | tar -C $(BUILD_DIR) -xf -
- touch $(SANDBOX_DIR)/.unpacked
+ touch $@
-$(PORTAGE_DIR)/.compiled: $(PORTAGE_DIR)/.unpacked
+$(PORTAGE_DIR)/.compiled: $(PORTAGE_DIR)/.patched
$(TARGET_CC) $(TARGET_CFLAGS) $(PORTAGE_DIR)/src/tbz2tool.c -o $(PORTAGE_DIR)/src/tbz2tool
- touch $(PORTAGE_DIR)/.compiled
+ touch $@
+
$(SANDBOX_DIR)/.compiled: $(SANDBOX_DIR)/.unpacked
- touch $(SANDBOX_DIR)/.compiled
+ touch $@
newins=install -D
doins=install
@@ -70,14 +83,20 @@
$(TARGET_DIR)/$(PORTAGE_TARGET_BINARY): $(PORTAGE_DIR)/.compiled
(cd $(PORTAGE_DIR)/cnf; \
$(newins) make.globals $(TARGET_DIR)/etc/make.globals; \
- $(newins) make.globals.$(PORTAGE_ARCH) $(TARGET_DIR)/etc/make.globals; \
$(newins) make.conf $(TARGET_DIR)/etc/make.conf; \
- $(newins) make.conf.$(PORTAGE_ARCH) $(TARGET_DIR)/etc/make.conf; \
+ cp $(TARGET_DIR)/etc/make.conf $(TARGET_DIR)/etc/make.conf.$(PORTAGE_ARCH); \
+ patch $(TARGET_DIR)/etc/make.conf.$(PORTAGE_ARCH) $(PORTAGE_DIR)/cnf/make.conf.$(PORTAGE_ARCH).diff; \
$(doins) etc-update.conf dispatch-conf.conf $(TARGET_DIR)/etc; \
)
+# $(newins) make.globals.$(PORTAGE_ARCH) $(TARGET_DIR)/etc/make.globals; \
+# $(newins) make.conf.$(PORTAGE_ARCH) $(TARGET_DIR)/etc/make.conf; \
$(dodir) $(PORTAGE_TARGET_DIR)/pym
- $(doins) $(PORTAGE_DIR)/pym/* $(PORTAGE_TARGET_DIR)/pym/
+ $(doins) $(PORTAGE_DIR)/pym/*.py $(PORTAGE_TARGET_DIR)/pym/
+ mkdir -p $(PORTAGE_TARGET_DIR)/pym/cache
+ $(doins) $(PORTAGE_DIR)/pym/cache/*.py $(PORTAGE_TARGET_DIR)/pym
+ mkdir -p $(PORTAGE_TARGET_DIR)/pym/elog_modules
+ $(doins) $(PORTAGE_DIR)/pym/elog_modules/*.py $(PORTAGE_TARGET_DIR)/pym/elog_modules
$(dodir) $(PORTAGE_TARGET_DIR)/bin
$(doexe) $(PORTAGE_DIR)/bin/* $(PORTAGE_DIR)/src/tbz2tool $(PORTAGE_TARGET_DIR)/bin/
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/portage
@ 2009-01-08 22:11 ulf at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: ulf at uclibc.org @ 2009-01-08 22:11 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-08 22:11:33 +0000 (Thu, 08 Jan 2009)
New Revision: 24726
Log:
Do not add PATCH_VERSION to PORTAGE_VERSION if patch is not applied, time to upgarde to 2.1.6?
Modified:
trunk/buildroot/package/portage/portage.mk
Changeset:
Modified: trunk/buildroot/package/portage/portage.mk
===================================================================
--- trunk/buildroot/package/portage/portage.mk 2009-01-08 17:19:01 UTC (rev 24725)
+++ trunk/buildroot/package/portage/portage.mk 2009-01-08 22:11:33 UTC (rev 24726)
@@ -5,8 +5,11 @@
#############################################################
PORTAGE_BASE_VERSION:=2.1.4
PORTAGE_DOWNLOAD_VERSION:=$(PORTAGE_BASE_VERSION)
+PORTAGE_PATCH_APPLY:=n
PORTAGE_PATCH_VERSION:=.4
-PORTAGE_PATCH_APPLY:=n
+ifeq ($(PORTAGE_PATCH_APPLY),n)
+PORTAGE_PATCH_VERSION:=
+endif
PORTAGE_VERSION:=$(PORTAGE_BASE_VERSION)$(PORTAGE_PATCH_VERSION)
PORTAGE_PATCH:=portage-$(PORTAGE_VERSION).patch.bz2
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/portage
@ 2008-05-11 6:45 ulf at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: ulf at uclibc.org @ 2008-05-11 6:45 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2008-05-10 23:45:17 -0700 (Sat, 10 May 2008)
New Revision: 21967
Log:
Bump portage version
Modified:
trunk/buildroot/package/portage/portage.mk
Changeset:
Modified: trunk/buildroot/package/portage/portage.mk
===================================================================
--- trunk/buildroot/package/portage/portage.mk 2008-05-11 06:44:20 UTC (rev 21966)
+++ trunk/buildroot/package/portage/portage.mk 2008-05-11 06:45:17 UTC (rev 21967)
@@ -3,9 +3,9 @@
# portage
#
#############################################################
-PORTAGE_BASE_VERSION:=2.1.3
-PORTAGE_DOWNLOAD_VERSION:=$(PORTAGE_BASE_VERSION).16
-PORTAGE_PATCH_VERSION:=.16
+PORTAGE_BASE_VERSION:=2.1.4
+PORTAGE_DOWNLOAD_VERSION:=$(PORTAGE_BASE_VERSION)
+PORTAGE_PATCH_VERSION:=.4
PORTAGE_PATCH_APPLY:=n
PORTAGE_VERSION:=$(PORTAGE_BASE_VERSION)$(PORTAGE_PATCH_VERSION)
PORTAGE_PATCH:=portage-$(PORTAGE_VERSION).patch.bz2
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/portage
@ 2007-11-27 21:15 ulf at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: ulf at uclibc.org @ 2007-11-27 21:15 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-11-27 13:15:15 -0800 (Tue, 27 Nov 2007)
New Revision: 20552
Log:
Bump portage to 2.1.3.16
Modified:
trunk/buildroot/package/portage/portage.mk
Changeset:
Modified: trunk/buildroot/package/portage/portage.mk
===================================================================
--- trunk/buildroot/package/portage/portage.mk 2007-11-27 09:42:33 UTC (rev 20551)
+++ trunk/buildroot/package/portage/portage.mk 2007-11-27 21:15:15 UTC (rev 20552)
@@ -3,14 +3,17 @@
# portage
#
#############################################################
-PORTAGE_DOWNLOAD_VERSION:=2.1.3
-PORTAGE_PATCH_VERSION:=.9
-PORTAGE_VERSION:=$(PORTAGE_DOWNLOAD_VERSION)$(PORTAGE_PATCH_VERSION)
+PORTAGE_BASE_VERSION:=2.1.3
+PORTAGE_DOWNLOAD_VERSION:=$(PORTAGE_BASE_VERSION).16
+PORTAGE_PATCH_VERSION:=.16
+PORTAGE_PATCH_APPLY:=n
+PORTAGE_VERSION:=$(PORTAGE_BASE_VERSION)$(PORTAGE_PATCH_VERSION)
PORTAGE_PATCH:=portage-$(PORTAGE_VERSION).patch.bz2
PORTAGE_SOURCE:=portage-$(PORTAGE_DOWNLOAD_VERSION).tar.bz2
PORTAGE_SITE:=http://gentoo.osuosl.org/distfiles
PORTAGE_CAT:=$(BZCAT)
+PORTAGE_DOWNLOAD_DIR:=$(BUILD_DIR)/portage-$(PORTAGE_DOWNLOAD_VERSION)
PORTAGE_DIR:=$(BUILD_DIR)/portage-$(PORTAGE_VERSION)
PORTAGE_TARGET_DIR:=$(TARGET_DIR)/usr/lib/portage
PORTAGE_TARGET_BINARY:=usr/bin/emerge
@@ -46,23 +49,31 @@
$(DL_DIR)/$(PORTAGE_SOURCE):
$(WGET) -P $(DL_DIR) $(PORTAGE_SITE)/$(PORTAGE_SOURCE)
-$(DL_DIR)/$(PORTAGE_PATCH):
- $(WGET) -P $(DL_DIR) $(PORTAGE_SITE)/$(PORTAGE_PATCH)
+
$(DL_DIR)/$(SANDBOX_SOURCE):
$(WGET) -P $(DL_DIR) $(SANDBOX_SITE)/$(SANDBOX_SOURCE)
portage-source: $(DL_DIR)/$(PORTAGE_SOURCE)
sandbox-source: $(DL_DIR)/$(SANDBOX_SOURCE)
-$(PORTAGE_DIR)/.unpacked: $(DL_DIR)/$(PORTAGE_SOURCE)
+$(PORTAGE_DOWNLOAD_DIR)/.unpacked: $(DL_DIR)/$(PORTAGE_SOURCE)
$(PORTAGE_CAT) $(DL_DIR)/$(PORTAGE_SOURCE) | tar -C $(BUILD_DIR) -xf -
+ touch $@
+
+ifeq ($(PORTAGE_PATCH_APPLY),y)
+$(DL_DIR)/$(PORTAGE_PATCH):
+ $(WGET) -P $(DL_DIR) $(PORTAGE_SITE)/$(PORTAGE_PATCH)
+
+$(PORTAGE_DIR)/.patched: $(PORTAGE_DOWNLOAD_DIR)/.unpacked $(DL_DIR)/$(PORTAGE_PATCH)
mv -f $(BUILD_DIR)/portage-$(PORTAGE_DOWNLOAD_VERSION) $(PORTAGE_DIR)
rm -f $(PORTAGE_DIR)/bin/tbz2tool
- touch $@
-
-$(PORTAGE_DIR)/.patched: $(PORTAGE_DIR)/.unpacked $(DL_DIR)/$(PORTAGE_PATCH)
(cd $(PORTAGE_DIR); $(PORTAGE_CAT) $(DL_DIR)/$(PORTAGE_PATCH) | patch -p0)
touch $@
+else
+$(PORTAGE_DIR)/.patched: $(PORTAGE_DOWNLOAD_DIR)/.unpacked
+ rm -f $(PORTAGE_DIR)/bin/tbz2tool
+ touch $@
+endif
$(SANDBOX_DIR)/.unpacked: $(DL_DIR)/$(SANDBOX_SOURCE)
$(SANDBOX_CAT) $(DL_DIR)/$(SANDBOX_SOURCE) | tar -C $(BUILD_DIR) -xf -
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/portage
@ 2007-11-16 12:48 vanokuten at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: vanokuten at uclibc.org @ 2007-11-16 12:48 UTC (permalink / raw)
To: buildroot
Author: vanokuten
Date: 2007-11-16 04:48:14 -0800 (Fri, 16 Nov 2007)
New Revision: 20436
Log:
update portage version and site
Modified:
trunk/buildroot/package/portage/portage.mk
Changeset:
Modified: trunk/buildroot/package/portage/portage.mk
===================================================================
--- trunk/buildroot/package/portage/portage.mk 2007-11-16 12:39:16 UTC (rev 20435)
+++ trunk/buildroot/package/portage/portage.mk 2007-11-16 12:48:14 UTC (rev 20436)
@@ -3,7 +3,7 @@
# portage
#
#############################################################
-PORTAGE_DOWNLOAD_VERSION:=2.1.2
+PORTAGE_DOWNLOAD_VERSION:=2.1.3
PORTAGE_PATCH_VERSION:=.9
PORTAGE_VERSION:=$(PORTAGE_DOWNLOAD_VERSION)$(PORTAGE_PATCH_VERSION)
PORTAGE_PATCH:=portage-$(PORTAGE_VERSION).patch.bz2
@@ -17,8 +17,7 @@
SANDBOX_VERSION:=1.2.18.1
SANDBOX_SOURCE:=sandbox-$(SANDBOX_VERSION).tar.bz2
-SANDBOX_SITE:=http://dev.gentoo.org/~azarah/sandbox/
-#SANDBOX_SITE:=$(PORTAGE_SITE)
+SANDBOX_SITE:=$(PORTAGE_SITE)
SANDBOX_CAT:=$(PORTAGE_CAT)
SANDBOX_DIR:=$(BUILD_DIR)/sandbox-$(SANDBOX_VERSION)
SANDBOX_TARGET_BINARY:=usr/bin/sandbox
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/portage
@ 2007-07-25 17:41 ulf at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: ulf at uclibc.org @ 2007-07-25 17:41 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-25 10:41:15 -0700 (Wed, 25 Jul 2007)
New Revision: 19263
Log:
Use better Sandbox site
Modified:
trunk/buildroot/package/portage/portage.mk
Changeset:
Modified: trunk/buildroot/package/portage/portage.mk
===================================================================
--- trunk/buildroot/package/portage/portage.mk 2007-07-25 17:39:46 UTC (rev 19262)
+++ trunk/buildroot/package/portage/portage.mk 2007-07-25 17:41:15 UTC (rev 19263)
@@ -17,7 +17,8 @@
SANDBOX_VERSION:=1.2.18.1
SANDBOX_SOURCE:=sandbox-$(SANDBOX_VERSION).tar.bz2
-SANDBOX_SITE:=$(PORTAGE_SITE)
+SANDBOX_SITE:=http://dev.gentoo.org/~azarah/sandbox/
+#SANDBOX_SITE:=$(PORTAGE_SITE)
SANDBOX_CAT:=$(PORTAGE_CAT)
SANDBOX_DIR:=$(BUILD_DIR)/sandbox-$(SANDBOX_VERSION)
SANDBOX_TARGET_BINARY:=usr/bin/sandbox
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/portage
@ 2006-08-10 20:58 andersen at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: andersen at uclibc.org @ 2006-08-10 20:58 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2006-08-10 13:58:14 -0700 (Thu, 10 Aug 2006)
New Revision: 15798
Log:
comparing $(ARCH) vs i.e. i386 isn't going to work when ARCH=i486 etc.
Need to instead compare vs BR2_i386 and friends.
Modified:
trunk/buildroot/package/portage/portage.mk
Changeset:
Modified: trunk/buildroot/package/portage/portage.mk
===================================================================
--- trunk/buildroot/package/portage/portage.mk 2006-08-10 20:21:33 UTC (rev 15797)
+++ trunk/buildroot/package/portage/portage.mk 2006-08-10 20:58:14 UTC (rev 15798)
@@ -18,22 +18,22 @@
SANDBOX_DIR:=$(BUILD_DIR)/sandbox-$(SANDBOX_VERSION)
SANDBOX_TARGET_BINARY:=usr/bin/sandbox
-ifeq ($(ARCH),cris)
+ifeq ($(BR2_cris),y)
PORTAGE_ARCH:=x86
endif
-ifeq ($(ARCH), mipsel)
+ifeq ($(BR2_mipsel),y)
PORTAGE_ARCH:=mips
endif
-ifeq ($(ARCH), powerpc)
+ifeq ($(BR2_powerpc),y)
PORTAGE_ARCH:=ppc
endif
-ifeq ($(ARCH),sh4)
+ifeq ($(BR2_sh4),y)
PORTAGE_ARCH:=sh
endif
-ifeq ($(ARCH),sh64)
+ifeq ($(BR2_sh64),y)
PORTAGE_ARCH:=sh
endif
-ifeq ($(ARCH), i386)
+ifeq ($(BR2_i386),y)
PORTAGE_ARCH:=x86
endif
ifeq ($(PORTAGE_ARCH),)
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-01-08 22:11 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-25 11:40 [Buildroot] svn commit: trunk/buildroot/package/portage ulf at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2009-01-08 22:11 ulf at uclibc.org
2008-05-11 6:45 ulf at uclibc.org
2007-11-27 21:15 ulf at uclibc.org
2007-11-16 12:48 vanokuten at uclibc.org
2007-07-25 17:41 ulf at uclibc.org
2006-08-10 20:58 andersen at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox