X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fmkresin.git;a=blobdiff_plain;f=package%2Fbase-files%2Fimage-config.in;h=5f84d115e53f7a02f8944e0fb19b5eba7b2157b6;hp=a9ec76a10bcc270213c242d963a911a7848f634f;hb=fa69553900516944fc43cf7b377105ea1f6d3db0;hpb=d8540259cab2e430a22f2d908529a5faf65d64ca diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index a9ec76a10b..5f84d115e5 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -18,11 +18,11 @@ config TARGET_PREINIT_SUPPRESS_STDERR default y help Sends stderr to null during preinit. This is the default behaviour - in previous versions of OpenWRT. This also prevents init process + in previous versions of OpenWrt. This also prevents init process itself from displaying stderr, however processes launched by init in multiuser through inittab will use the current terminal (e.g. the ash shell launched by inittab will display stderr). That's - the same behaviour as seen in previous version of OpenWRT. + the same behaviour as seen in previous version of OpenWrt. config TARGET_PREINIT_TIMEOUT int @@ -99,7 +99,7 @@ menuconfig INITOPT config TARGET_INIT_PATH string prompt "PATH for regular boot" if INITOPT - default "/bin:/sbin:/usr/bin:/usr/sbin" + default "/usr/sbin:/usr/bin:/sbin:/bin" help Default PATH used during normal operation @@ -128,7 +128,7 @@ menuconfig INITOPT help Prevents showing stderr messages for init command if not already suppressed during preinit. This is the default behaviour in - previous versions of OpenWRT. Removing this does nothing if + previous versions of OpenWrt. Removing this does nothing if stderr is suppressed during preinit (which is the default). @@ -142,24 +142,26 @@ menuconfig VERSIONOPT they're useful for release builds or custom OpenWrt redistributions that should carry custom version tags. +if VERSIONOPT + config VERSION_DIST string - prompt "Release distribution" if VERSIONOPT - default "OpenWrt" + prompt "Release distribution" + default "Lede" help This is the name of the release distribution. If unspecified, it defaults to OpenWrt. config VERSION_NICK string - prompt "Release version nickname" if VERSIONOPT + 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" if VERSIONOPT + 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 @@ -167,19 +169,123 @@ menuconfig VERSIONOPT config VERSION_REPO string - prompt "Release repository" if VERSIONOPT - default "http://downloads.openwrt.org/snapshots/trunk/%T/packages" + prompt "Release repository" + default "http://downloads.lede-project.org/snapshots/trunk/%S/packages" 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 "Bleeding Edge", uppercase - %c .. Release version or "bleeding_edge", 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 "OpenWrt", uppercase - %d .. Distribution name or "openwrt", lowercase + %D .. Distribution name or "Lede", uppercase + %d .. Distribution name or "lede", lowercase %T .. Target name %S .. Target/Subtarget name + %t .. Build taint flags, e.g. "no-all busybox" + %M .. Manufacturer name or "Lede" + %P .. Product name or "Generic" + %h .. Hardware revision or "v0" + + config VERSION_MANUFACTURER + string + prompt "Manufacturer name" + help + This is the manufacturer name embedded in /etc/device_info + Useful for OEMs building OpenWrt based firmware + + config VERSION_MANUFACTURER_URL + string + prompt "Manufacturer URL" + help + This is an URL to the manufacturer's website embedded in /etc/device_info + Useful for OEMs building OpenWrt based firmware + + config VERSION_PRODUCT + string + prompt "Product name" + help + This is the product name embedded in /etc/device_info + Useful for OEMs building OpenWrt based firmware + + config VERSION_HWREV + string + prompt "Hardware revision" + help + This is the hardware revision string embedded in /etc/device_info + Useful for OEMs building OpenWrt based firmware + + config VERSION_FILENAMES + bool + prompt "Version number in filenames" + default y + help + Enable this to include the version number in firmware image, SDK- + and Image Builder archive file names +endif + + +menuconfig PER_FEED_REPO + bool "Separate feed repositories" if IMAGEOPT + default y + help + 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.