X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fbase-files%2Fimage-config.in;h=ac406bc456bd91c17e5ffef7da01314a5477bdc5;hb=ebcb4f1d0a091d1fa87d6aa04ecae355ef23ef22;hp=43d3859301487391394a6838e88701e5b37916e9;hpb=f954f4337b85bd8d8ad6a589bc63edf48f777ee6;p=openwrt%2Fstaging%2Fjow.git diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index 43d3859301..ac406bc456 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -119,7 +119,7 @@ menuconfig INITOPT prompt "Environment variables to set when starting init (start with none)" if INITOPT default "" help - Should be a space seperated list of variable assignments. These + Should be a space separated list of variable assignments. These variables will be present in the environment. Spaces may not be present (including through expansion) even in a quoted string (env doesn't understanding quoting). @@ -158,50 +158,56 @@ if VERSIONOPT config VERSION_DIST string prompt "Release distribution" - default "Lede" + default "OpenWrt" help This is the name of the release distribution. If unspecified, it defaults to OpenWrt. - config VERSION_NICK - string - prompt "Release version nickname" - help - This is the release codename embedded in the image. - If unspecified, it defaults to the name of source branch. - config VERSION_NUMBER string prompt "Release version number" help This is the release version number embedded in the image. - If unspecified, it defaults to the svn or git-svn revision - of the build tree. + If unspecified, it defaults to SNAPSHOT for the master branch + or to ##.##-SNAPSHOT on release branches. + + config VERSION_CODE + string + prompt "Release version code" + help + This is the release version code embedded in the image. + If unspecified, it defaults to a revision number describing the + repository version of the source, e.g. the number of commits + since a branch point or a short Git commit ID. config VERSION_REPO string prompt "Release repository" - default "http://downloads.lede-project.org/snapshots" + default "https://downloads.openwrt.org/snapshots" help This is the repository address embedded in the image, it defaults to the trunk snapshot repo; the url may contain the following placeholders: - %R .. Revision number - %V .. Release version or revision number, uppercase - %v .. Release version or revision number, lowercase - %C .. Release version or "HEAD", uppercase - %c .. Release version or "head", lowercase - %N .. Release name, uppercase - %n .. Release name, lowercase - %D .. Distribution name or "Lede", uppercase - %d .. Distribution name or "lede", lowercase + %R .. Repository revision ID + %V .. Configured release version number or "SNAPSHOT", uppercase + %v .. Configured release version number or "snapshot", lowercase + %C .. Configured release revision code or value of %R, uppercase + %c .. Configured release revision code or value of %R, lowercase + %D .. Distribution name or "OpenWrt", uppercase + %d .. Distribution name or "openwrt", lowercase %T .. Target name %S .. Target/Subtarget name %A .. Package architecture %t .. Build taint flags, e.g. "no-all busybox" - %M .. Manufacturer name or "Lede" + %M .. Manufacturer name or "OpenWrt" %P .. Product name or "Generic" %h .. Hardware revision or "v0" + config VERSION_HOME_URL + string + prompt "Release Homepage" + help + This is the release version homepage + config VERSION_MANUFACTURER string prompt "Manufacturer name" @@ -249,6 +255,15 @@ if VERSIONOPT help Enable this to include the version number in firmware image, SDK- and Image Builder archive file names + + config VERSION_CODE_FILENAMES + bool + prompt "Revision code in filenames" + default y + help + Enable this to include the revision identifier or the configured + version code into the firmware image, SDK- and Image Builder archive + file names endif @@ -259,57 +274,4 @@ menuconfig PER_FEED_REPO If set, a separate repository is generated within bin/*/packages/ for the core packages and each enabled feed. - config PER_FEED_REPO_ADD_DISABLED - bool "Add available but not enabled feeds to opkg.conf" - default y - depends on PER_FEED_REPO - help - Add not installed or disabled feeds from feeds.conf to opkg.conf. - - config PER_FEED_REPO_ADD_COMMENTED - bool "Comment out not enabled feeds" - default y - depends on PER_FEED_REPO && PER_FEED_REPO_ADD_DISABLED - help - Add not enabled feeds as commented out source lines to opkg.conf. - source "tmp/.config-feeds.in" - - -menuconfig SMIMEOPT - bool "Package signing options" if IMAGEOPT - default n - help - These options configure the signing key and certificate to - be used for signing and verifying packages. - - config OPKGSMIME_CERT - string - prompt "Path to certificate (PEM certificate format)" if SMIMEOPT - help - Path to the certificate to use for signature verification - - config OPKGSMIME_KEY - string - prompt "Path to signing key (PEM private key format)" if SMIMEOPT - help - Path to the key to use for signing packages - - config OPKGSMIME_PASSPHRASE - bool - default y - prompt "Wait for a passphrase when signing packages?" if SMIMEOPT - help - If this value is set, then the build will pause and request a passphrase - from the command line when signing packages. This SHOULD NOT be used with - automatic builds. If this value is not set, a file can be specified from - which the passphrase will be read. - - config OPKGSMIME_PASSFILE - string - prompt "Path to a file containing the passphrase" if SMIMEOPT - depends on !OPKGSMIME_PASSPHRASE - help - Path to a file containing the passphrase for the signing key. - If the signing key is not encrypted and does not require a passphrase, - this option may be left blank.