build: removed WRS_WR_REPOSITORY as upstream source

The white rabbit repository doesn't include upstream archives for this version of buildroot, and I don't want to commit them there. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

build: removed WRS_WR_REPOSITORY as upstream source
The white rabbit repository doesn't include upstream archives for this version of buildroot, and I don't want to commit them there. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
5bd47172 · Alessandro Rubini · 63739dfc · 5bd47172 · 5bd47172 · 5bd47172
Commit 5bd47172 authored Jan 10, 2012 by Alessandro Rubini
10 changed files
--- a/build/scripts/wrs_build_at91boot
+++ b/build/scripts/wrs_build_at91boot
@@ -8,7 +8,7 @@ if [ -z "$WRS_BASE_DIR" ]; then
 fi
 . ${WRS_BASE_DIR}/scripts/wrs_functions

-wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR WRS_WR_REPOSITORY CROSS_COMPILE
+wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR CROSS_COMPILE

 wrs_echo "--- AT91Boot"
 zipname="AT91Bootstrap1.11.zip"

--- a/build/scripts/wrs_build_u-boot
+++ b/build/scripts/wrs_build_u-boot
@@ -8,7 +8,7 @@ if [ -z "$WRS_BASE_DIR" ]; then
 fi
 . ${WRS_BASE_DIR}/scripts/wrs_functions

-wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR WRS_WR_REPOSITORY CROSS_COMPILE
+wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR CROSS_COMPILE

 wrs_echo "--- U-Boot"
 zipname="u-boot-1.3.4.tar.bz2"

--- a/build/scripts/wrs_build_buildroot
+++ b/build/scripts/wrs_build_buildroot
@@ -8,7 +8,7 @@ if [ -z "$WRS_BASE_DIR" ]; then
 fi
 . ${WRS_BASE_DIR}/scripts/wrs_functions

-wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR WRS_WR_REPOSITORY
+wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR

 wrs_echo "--- Buildroot compiler and filesystem"
 zipname="buildroot-2009.11.tar.bz2"
@@ -81,23 +81,6 @@ buildrootdir=$(/bin/pwd)
 mkdir -p $WRS_DOWNLOAD_DIR/buildroot-pkg || die "mkdir within downloads"
 cd $WRS_DOWNLOAD_DIR/buildroot-pkg

-repodir=$(echo $WRS_WR_REPOSITORY | sed 's-^file:/*-/-')
-repodir=$repodir/trunk/pkg/buildroot-pkg
-
-if [ -d $repodir ]; then
-    if ln $repodir/* . 2> /dev/null; then
-	wrs_echo "Hardlinked packages from $repodir"
-    else
-	cp -a $repodir/* . || wrs_die "copying"
-	wrs_echo "Copied packages from $repodir"
-    fi
-else
-    # The repository is remote, but wget fails (bug, won't be fixed: see
-    # http://lists.gnu.org/archive/html/bug-wget/2010-04/msg00038.html
-    wrs_echo "Can't mass-download from $WRS_WR_REPOSITORY, delaying download"
-    #wget -nd -np -nc -nv -r $WRS_WR_REPOSITORY/trunk/pkg/buildroot-pkg/
-fi
-
 # buildroot wants its own guest source packages to be within its own dir..
 # so "cd" to the place we saved, and copy stuff here as well
 cd $buildrootdir

--- a/build/scripts/wrs_build_kernel
+++ b/build/scripts/wrs_build_kernel
@@ -8,7 +8,7 @@ if [ -z "$WRS_BASE_DIR" ]; then
 fi
 . ${WRS_BASE_DIR}/scripts/wrs_functions

-wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR WRS_WR_REPOSITORY CROSS_COMPILE
+wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR CROSS_COMPILE

 wrs_echo "--- Linux kernel for switch"
 zipname="buildroot-pkg/linux-2.6.39.tar.bz2"

--- a/build/scripts/wrs_build_modules
+++ b/build/scripts/wrs_build_modules
@@ -8,7 +8,7 @@ if [ -z "$WRS_BASE_DIR" ]; then
 fi
 . ${WRS_BASE_DIR}/scripts/wrs_functions

-wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR WRS_WR_REPOSITORY CROSS_COMPILE
+wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR CROSS_COMPILE

 wrs_echo "--- Kernel modules from this package"


--- a/build/scripts/wrs_build_ptp_noposix
+++ b/build/scripts/wrs_build_ptp_noposix
@@ -7,7 +7,7 @@ if [ -z "$WRS_BASE_DIR" ]; then
 fi
 . ${WRS_BASE_DIR}/scripts/wrs_functions

-wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR WRS_WR_REPOSITORY CROSS_COMPILE
+wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR CROSS_COMPILE

 wrs_echo "--- PTP daemon (noposix repository)"


--- a/build/scripts/wrs_build_userspace
+++ b/build/scripts/wrs_build_userspace
@@ -8,7 +8,7 @@ if [ -z "$WRS_BASE_DIR" ]; then
 fi
 . ${WRS_BASE_DIR}/scripts/wrs_functions

-wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR WRS_WR_REPOSITORY CROSS_COMPILE
+wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR CROSS_COMPILE

 wrs_echo "--- User space tools"


--- a/build/scripts/wrs_build_wraprootfs
+++ b/build/scripts/wrs_build_wraprootfs
@@ -8,7 +8,7 @@ if [ -z "$WRS_BASE_DIR" ]; then
 fi
 . ${WRS_BASE_DIR}/scripts/wrs_functions

-wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR WRS_WR_REPOSITORY CROSS_COMPILE
+wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR CROSS_COMPILE

 wrs_echo "--- Wrapping filesystem"


--- a/build/scripts/wrs_functions
+++ b/build/scripts/wrs_functions
@@ -144,15 +144,6 @@ function wrs_download {
 	fi
    fi

-    # Check if svn is local and the file exists
-    repodir=$(echo $WRS_WR_REPOSITORY | sed 's-^file:/*-/-')
-    repofile=$repodir/trunk/$svnname
-    if [ -f $repofile ]; then
-	cp $repofile $output
-	wrs_echo "Copied $file from local svn repo"
-	return
-    fi
-
    # Download from upstream
    wget -nv $upstream -O $output
    if [ -f $output ]; then
@@ -160,13 +151,6 @@ function wrs_download {
 	return
    fi

-    # Finally, get from ohwr.org
-    wget -nv $WRS_WR_REPOSITORY/trunk/$svnname \
-	-O $output
-    if [ -f $output ]; then
-	wrs_echo "Retrieved $file from ohwr.org"
-	return
-    fi
    wrs_error "Cannot download $file"
 }


--- a/build/wrs_build-all
+++ b/build/wrs_build-all
@@ -17,7 +17,6 @@ export WRS_BASE_DIR
 # See documentation for the meaning of these variables
 wrs_setenv_default WRS_OUTPUT_DIR      $(/bin/pwd)
 wrs_setenv_default WRS_DOWNLOAD_DIR    ${WRS_OUTPUT_DIR}/downloads
-wrs_setenv_default WRS_WR_REPOSITORY   http://svn.ohwr.org/white-rabbit

 # Refuse to build within the directory itself
 if [ "$WRS_OUTPUT_DIR" = "$WRS_BASE_DIR" ]; then
@@ -41,7 +40,7 @@ fi

 export WRS_SCRIPTS_DIR=${WRS_BASE_DIR}/scripts

-wrs_show_vars WRS_BASE_DIR WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR WRS_WR_REPOSITORY \
+wrs_show_vars WRS_BASE_DIR WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR \
    WRS_SCRIPTS_DIR WRS_DONE_DIR CROSS_COMPILE

 # The function builds one step if needed: if the marker file exists, then the