rump: retrieve port sources using git

fixes #2621
This commit is contained in:
Sebastian Sumpf 2018-01-03 14:55:27 +01:00 committed by Christian Helmuth
parent bac3d620c6
commit 8af45fd5fb
5 changed files with 7 additions and 56 deletions

View File

@ -10,7 +10,7 @@ $(RUMP_BASE)/include/machine: $(RUMP_BASE)
$(VERBOSE_MK)mkdir -p $(RUMP_BASE)/include
$(VERBOSE_MK)for arch in $(INC_ARCH); do \
ln -sf $(RUMP_PORT_DIR)/src/sys/arch/$$arch/include $(RUMP_BASE)/include/$$arch ; done
$(VERBOSE_MK)touch $(RUMP_BASE)/include/pthread_types.h
$(VERBOSE_MK)touch -a $(RUMP_BASE)/include/pthread_types.h
$(VERBOSE_MK)ln -sf $(INC_MACHINE) $(RUMP_BASE)/include/machine
all: $(RUMP_BASE)/include/machine

View File

@ -1,12 +0,0 @@
diff --git a/src/usr.bin/config/gram.y b/src/usr.bin/config/gram.y
index 7e63598..5f9064a 100644
--- a/src/usr.bin/config/gram.y
+++ b/src/usr.bin/config/gram.y
@@ -142,6 +142,7 @@ static struct condexpr *mk_cx_or(struct condexpr *, struct condexpr *);
static void setmachine(const char *, const char *, struct nvlist *, int);
static void check_maxpart(void);
+static void check_version(void);
static struct loclist *present_loclist(struct loclist *ll);
static void app(struct loclist *, struct loclist *);

View File

@ -1,23 +0,0 @@
diff --git a/sys/arch/arm/include/lock.h b/sys/arch/arm/include/lock.h
index ba612d5..8e0e2f3 100644
--- a/src/sys/arch/arm/include/lock.h
+++ b/src/sys/arch/arm/include/lock.h
@@ -105,8 +105,18 @@ static __inline unsigned char
__swp(unsigned char __val, __cpu_simple_lock_t *__ptr)
{
uint32_t __val32;
+#ifdef _ARM_ARCH_6
__asm volatile("swpb %0, %1, [%2]"
: "=&r" (__val32) : "r" (__val), "r" (__ptr) : "memory");
+#else
+ __asm volatile(" 1: \n"
+ " ldrexb %0, [%2] \n"
+ " strexb r0, %1, [%2]\n"
+ " teqeq r0, #0 \n"
+ " bne 1b \n"
+ : "=&r" (__val32) : "r" (__val), "r" (__ptr)
+ : "memory", "r0");
+#endif
return __val32;
}
#else

View File

@ -1 +1 @@
2e7f21f64fa91b723c2679eb3ed90d8c861d6273
88651ddaf056424fee8354603d57c8fd34ef4e05

View File

@ -1,20 +1,6 @@
LICENSE := BSD
VERSION := cvs
DOWNLOADS := rump.cvs
$(call check_tool, cvs)
URL(rump) := :pserver:anoncvs@anoncvs.netbsd.org:2401/cvsroot
REV(rump) := "20141216 2100UTC"
DIR(rump) := src/lib/dde_rump
HASH_INPUT += $(REP_DIR)/rump.list
PATCHES := $(shell find $(REP_DIR)/patches/*.patch)
PATCH_OPT := -N -d ${DIR(rump)} -p1
%.cvs:
@echo "CVS checkout rump ..."
$(VERBOSE)cat $(REP_DIR)/rump.list | xargs cvs -d $(URL($*)) -Q -z3 export \
-D $(REV($*)) -d $(DIR($*))
# vi: set ft=make :
VERSION := git
DOWNLOADS := rump.git
URL(rump) := https://github.com/ssumpf/rump.git
DIR(rump) := src/lib/dde_rump
REV(rump) := 206ffa06cedd0779af0043997fd182b00ff4688c