From 3f794fad83e51a090191803aa54f4a7fe0d5a2ef Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 26 Mar 2014 12:32:06 +0100 Subject: remove git as dependency, we now have snapshot tarballs --- Makefile | 1 + README | 1 - docs/contribute.txt | 1 + docs/getting.txt | 6 ++++-- docs/introduction.txt | 6 ++++++ docs/patch-policy.txt | 12 ++++++++++-- package/base-files/Makefile | 3 ++- scripts/scan-tools.sh | 6 ------ 8 files changed, 24 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 8c603e196..396675ac2 100644 --- a/Makefile +++ b/Makefile @@ -224,6 +224,7 @@ NO_ERROR=0 @echo "_PATH:=$$PATH" >>prereq.mk @echo "PATH:=\$${TOPDIR}/scripts:/usr/sbin:$$PATH" >>prereq.mk @echo "SHELL:=$$(which bash)" >>prereq.mk + @echo "GIT:=$$(which git 2>/dev/null)" >>prereq.mk @env NO_ERROR=${NO_ERROR} BASH="$$(which bash)" \ CC='${CC}' CPPFLAGS='${CPPFLAGS}' \ bash scripts/scan-tools.sh diff --git a/README b/README index 65011f0ad..687950abd 100644 --- a/README +++ b/README @@ -19,7 +19,6 @@ Before you can start you need to install some tools: - ncurses5 headers - zlib headers - perl -- git There is a check for the required versions of these tools in advance, though. (to re-issue the checks, use "make prereq"). diff --git a/docs/contribute.txt b/docs/contribute.txt index 909263886..5a8e1fdd8 100644 --- a/docs/contribute.txt +++ b/docs/contribute.txt @@ -82,6 +82,7 @@ Here is a short list of details to provide in such case: * target for which the build fails * package(s) which the build fails * the command that fails and its output +* the make.log file, generated when make v is used * any information you think that may be relevant Additionally, you can add the +.config+ file. diff --git a/docs/getting.txt b/docs/getting.txt index 534ba99c9..0902bb6e0 100644 --- a/docs/getting.txt +++ b/docs/getting.txt @@ -5,8 +5,9 @@ Getting OpenADK --------------- -OpenADK does not have any releases. Only direct Git -access is possible. +OpenADK does not have any releases. We are following the +http://en.wikipedia.org/wiki/Rolling_release[rolling release] +development model. To download OpenADK using Git just do: @@ -20,3 +21,4 @@ Or if you prefer HTTP or using Git behind a proxy: $ git clone http://git.openadk.org/openadk.git --------------------- +Or you can get a http://www.openadk.org/snapshots/[snapshot]. diff --git a/docs/introduction.txt b/docs/introduction.txt index 991747672..3489c9d5f 100644 --- a/docs/introduction.txt +++ b/docs/introduction.txt @@ -24,3 +24,9 @@ processors, MIPS processors, ARM processors, etc. OpenADK supports numerous processors and their variants; it also comes with default configurations for some embedded systems and netbooks. (Raspberry PI, Sharp Zaurus, Lemote Yeelong, IBM X40 and more) + +OpenADK is not a Linux distribution and there are no releases or binary +packages available. If you need something like that, better switch to +something else. OpenADK builds everything from source. There are only a +few exceptions to this rule (f.e. some bootloaders and firmware files for +wireless network cards). diff --git a/docs/patch-policy.txt b/docs/patch-policy.txt index b5a585b5e..e948661cf 100644 --- a/docs/patch-policy.txt +++ b/docs/patch-policy.txt @@ -10,8 +10,8 @@ While integrating a new package or updating an existing one, it may be necessary to patch the source of the software to get it cross-built within OpenADK. OpenADK offers an infrastructure to automatically handle this during the builds. Patches are provided within OpenADK, in the package directory; -these typically aim to fix cross-compilation, libc support, or other such -issues. +these typically aim to fix cross-compilation, libc support, portability issues +or other things. Normally the patches are autogenerated via: ------------ @@ -80,3 +80,11 @@ Fetch from: It is also sensible to add a few words about any changes to the patch that may have been necessary. + +Upstreaming patches +~~~~~~~~~~~~~~~~~~~ + +OpenADK tries to avoid any patches to the source code. If a patch could +not be avoided, it should be tried to make the patch of a good quality to +get it upstream. OpenADK tries to report any found issues and try to send +in any upstream compatible patches. diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 45e7f1cc4..3711e7a00 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -77,7 +77,8 @@ endif test -z $(ADK_RUNTIME_PASSWORD) || \ $(SED) 's,\*NP\*,'"$$($(STAGING_HOST_DIR)/usr/bin/mkcrypt \ ${ADK_RUNTIME_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/shadow - git log -1|head -1|sed -e 's#commit ##' \ + test -z $(GIT) || \ + $(GIT) log -1|head -1|sed -e 's#commit ##' \ > $(IDIR_BASE_FILES)/etc/adkversion test -z $(ADK_TARGET_SYSTEM) || \ echo $(ADK_TARGET_SYSTEM) > $(IDIR_BASE_FILES)/etc/adktarget diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index 33365483a..c16aff609 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -208,12 +208,6 @@ if ! which g++ >/dev/null 2>&1; then out=1 fi -if ! which git >/dev/null 2>&1; then - echo "You need git to continue." - echo - out=1 -fi - cd $topdir rm -rf tmp -- cgit v1.2.3