From 17558e836e59c9f9835a5fc832b6b86f7035d676 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 4 Feb 2015 17:35:51 -0600 Subject: cleanup binfmt support, fix m68k build --- target/config/Config.in.binfmt | 12 ++---------- target/config/Config.in.toolchain | 1 - toolchain/elf2flt/Makefile | 5 +++++ 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/target/config/Config.in.binfmt b/target/config/Config.in.binfmt index 3183d7b5d..88c875d84 100644 --- a/target/config/Config.in.binfmt +++ b/target/config/Config.in.binfmt @@ -7,27 +7,19 @@ depends on ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K || ADK_TARGET_ARCH_BFIN | config ADK_TARGET_BINFMT_ELF bool "ELF" - depends on !ADK_TARGET_ARCH_C6X - depends on !ADK_TARGET_ARCH_BFIN - depends on !ADK_TARGET_ARCH_ARM + depends on (ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K) && !ADK_TARGET_UCLINUX config ADK_TARGET_BINFMT_DSBT bool "DSBT" depends on ADK_TARGET_ARCH_C6X - depends on !ADK_TARGET_ARCH_BFIN - depends on !ADK_TARGET_ARCH_M68K - depends on !ADK_TARGET_ARCH_ARM config ADK_TARGET_BINFMT_FDPIC bool "FDPIC" depends on ADK_TARGET_ARCH_BFIN - depends on !ADK_TARGET_ARCH_C6X - depends on !ADK_TARGET_ARCH_ARM config ADK_TARGET_BINFMT_FLAT bool "FLAT" - depends on !ADK_TARGET_ARCH_C6X - depends on ADK_TARGET_ARCH_ARM && ADK_TARGET_UCLINUX + depends on (ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K) && ADK_TARGET_UCLINUX endchoice diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain index 670833009..bff7e3d9e 100644 --- a/target/config/Config.in.toolchain +++ b/target/config/Config.in.toolchain @@ -78,7 +78,6 @@ config ADK_TOOLCHAIN_BINUTILS_2_24 depends on !ADK_TARGET_ARCH_ARC depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_CRIS - depends on !ADK_TARGET_ARCH_M68K config ADK_TOOLCHAIN_BINUTILS_GIT bool "git" diff --git a/toolchain/elf2flt/Makefile b/toolchain/elf2flt/Makefile index a42398a3e..0b07d4dc0 100644 --- a/toolchain/elf2flt/Makefile +++ b/toolchain/elf2flt/Makefile @@ -6,7 +6,12 @@ include Makefile.inc include ../rules.mk include ${ADK_TOPDIR}/mk/buildhlp.mk +ifeq ($(ADK_TOOLCHAIN_BINUTILS_GIT),y) +BINUTILS_VERSION:= git +endif +ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_24),y) BINUTILS_VERSION:= 2.24 +endif $(WRKBUILD)/.headers: $(WRKBUILD)/.configured: -- cgit v1.2.3 From 7ffb18241061198855c1edfc1af3e086a337b4b9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 5 Feb 2015 11:15:13 +0100 Subject: remove circular dependency --- package/libXtst/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libXtst/Makefile b/package/libXtst/Makefile index 38591beca..6c42782f2 100644 --- a/package/libXtst/Makefile +++ b/package/libXtst/Makefile @@ -13,7 +13,7 @@ PKG_BUILDDEP+= recordproto libXi HOST_BUILDDEP:= recordproto-host xproto-host xextproto-host HOST_BUILDDEP+= inputproto-host kbproto-host xtrans-host HOST_BUILDDEP+= xcb-proto-host libXau-host libpthread-stubs-host -HOST_BUILDDEP+= libX11-host libXext-host libXi-host libXtst-host +HOST_BUILDDEP+= libX11-host libXext-host libXi-host PKG_SITES:= ${MASTER_SITE_XORG} PKG_LIBNAME:= libxtst PKG_OPTS:= dev -- cgit v1.2.3 From c52d834d7ffd4a028efa483b1e347551a9c9bddf Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 5 Feb 2015 11:28:00 +0100 Subject: use noremove here. --- package/libstdcxx/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile index b95cfcba2..771754d0b 100644 --- a/package/libstdcxx/Makefile +++ b/package/libstdcxx/Makefile @@ -19,7 +19,7 @@ endif PKG_NAME:= libstdcxx PKG_DESCR:= c++ support library PKG_SECTION:= libs/misc -PKG_OPTS:= nostaging +PKG_OPTS:= noremove NO_DISTFILES:= 1 include ${ADK_TOPDIR}/mk/package.mk @@ -32,7 +32,8 @@ INSTALL_STYLE:= manual do-install: ${INSTALL_DIR} ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH} - $(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH} + $(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so* \ + ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH} -@rm ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}/libstdc++.so.*-gdb.py include ${ADK_TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From d2b3fe38c6b25f096ea20f0339fea1a0f6dc3421 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 5 Feb 2015 11:28:26 +0100 Subject: must be compiled with PIC, otherwise Ruby Hostbuild fails --- package/openssl/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 09c82b08a..37d11baf0 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openssl PKG_VERSION:= 1.0.1j -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= 1b60ca8789ba6f03e8ef20da2293b8dc131c39d83814e775069f02d26354edf3 PKG_DESCR:= secure socket layer libraries PKG_SECTION:= libs/crypto @@ -64,7 +64,7 @@ CONFIG:= linux-embedded endif host-configure: - (cd $(WRKBUILD); ./config --prefix='$(STAGING_HOST_DIR)/usr') + (cd $(WRKBUILD); ./config --prefix='$(STAGING_HOST_DIR)/usr' -fPIC) host-build: (cd $(WRKBUILD); make) -- cgit v1.2.3 From e745f3654ea180805da502b234fd9efe26eff9f6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 5 Feb 2015 13:14:45 +0100 Subject: rework php package, use php-cgi as binary name --- package/php/Makefile | 4 +- package/php/files/php.ini | 486 +-------------------------------------------- package/php/files/php.init | 12 +- 3 files changed, 17 insertions(+), 485 deletions(-) diff --git a/package/php/Makefile b/package/php/Makefile index 77ee32ffc..81d75467b 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= php PKG_VERSION:= 5.6.3 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= fad244506cc7f10fe56aba8129b3c39a4f9316d9544a4fba932c3f81fc2244b5 PKG_DESCR:= php language interpreter PKG_SECTION:= dev/lang @@ -70,8 +70,6 @@ PKGFD_MOD_ZLIB:= zlib support PKGFB_MOD_ZLIB:= zlib PKGFS_MOD_ZLIB:= zlib -PKG_HOST_DEPENDS:= !cygwin - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,PHP,php,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/php/files/php.ini b/package/php/files/php.ini index 3858e4a8b..5b16bb80e 100644 --- a/package/php/files/php.ini +++ b/package/php/files/php.ini @@ -1,552 +1,78 @@ [PHP] - -cgi.fix_pathinfo=1 - +cgi.fix_pathinfo = 0 zend.ze1_compatibility_mode = Off - -;short_open_tag = Off asp_tags = Off -precision = 12 +precision = 12 y2k_compliance = On output_buffering = Off - zlib.output_compression = Off -;zlib.output_handler = implicit_flush = Off - unserialize_callback_func= serialize_precision = 100 - safe_mode = Off - safe_mode_gid = Off - safe_mode_include_dir = - safe_mode_exec_dir = - safe_mode_allowed_env_vars = PHP_ - safe_mode_protected_env_vars = LD_LIBRARY_PATH - -;open_basedir = - disable_functions = - disable_classes = - -; Colors for Syntax Highlighting mode. Anything that's acceptable in -; would work. -;highlight.string = #DD0000 -;highlight.comment = #FF9900 -;highlight.keyword = #007700 -;highlight.bg = #FFFFFF -;highlight.default = #0000BB -;highlight.html = #000000 - expose_php = On - - -;;;;;;;;;;;;;;;;;;; -; Resource Limits ; -;;;;;;;;;;;;;;;;;;; - max_execution_time = 30 ; Maximum execution time of each script, in seconds max_input_time = 60 ; Maximum amount of time each script may spend parsing request data -memory_limit = 32M ; Maximum amount of memory a script may consume (8MB) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; Error handling and logging ; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -; error_reporting is a bit-field. Or each number up to get desired error -; reporting level -; E_ALL - All errors and warnings (doesn't include E_STRICT) -; E_ERROR - fatal run-time errors -; E_WARNING - run-time warnings (non-fatal errors) -; E_PARSE - compile-time parse errors -; E_NOTICE - run-time notices (these are warnings which often result -; from a bug in your code, but it's possible that it was -; intentional (e.g., using an uninitialized variable and -; relying on the fact it's automatically initialized to an -; empty string) -; E_STRICT - run-time notices, enable to have PHP suggest changes -; to your code which will ensure the best interoperability -; and forward compatibility of your code -; E_CORE_ERROR - fatal errors that occur during PHP's initial startup -; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's -; initial startup -; E_COMPILE_ERROR - fatal compile-time errors -; E_COMPILE_WARNING - compile-time warnings (non-fatal errors) -; E_USER_ERROR - user-generated error message -; E_USER_WARNING - user-generated warning message -; E_USER_NOTICE - user-generated notice message -; -; Examples: -; -; - Show all errors, except for notices and coding standards warnings -; -;error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT -; -; - Show all errors, except for notices -; -;error_reporting = E_ALL & ~E_NOTICE -; -; - Show only errors -; -;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR -; -; - Show all errors except for notices and coding standards warnings -; +memory_limit = 64M ; Maximum amount of memory a script may consume (8MB) error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT - -; Print out errors (as a part of the output). For production web sites, -; you're strongly encouraged to turn this feature off, and use error logging -; instead (see below). Keeping display_errors enabled on a production web site -; may reveal security information to end users, such as file paths on your Web -; server, your database schema or other information. display_errors = Off - -; Even when display_errors is on, errors that occur during PHP's startup -; sequence are not displayed. It's strongly recommended to keep -; display_startup_errors off, except for when debugging. display_startup_errors = Off - -; Log errors into a log file (server-specific log, stderr, or error_log (below)) -; As stated above, you're strongly advised to use error logging in place of -; error displaying on production web sites. log_errors = On - -; Set maximum length of log_errors. In error_log information about the source is -; added. The default is 1024 and 0 allows to not apply any maximum length at all. log_errors_max_len = 1024 - -; Do not log repeated messages. Repeated errors must occur in same file on same -; line until ignore_repeated_source is set true. ignore_repeated_errors = Off - -; Ignore source of message when ignoring repeated messages. When this setting -; is On you will not log errors with repeated messages from different files or -; sourcelines. ignore_repeated_source = Off - -; If this parameter is set to Off, then memory leaks will not be shown (on -; stdout or in the log). This has only effect in a debug compile, and if -; error reporting includes E_WARNING in the allowed list report_memleaks = On - -; Store the last error/warning message in $php_errormsg (boolean). track_errors = Off - -; Disable the inclusion of HTML tags in error messages. -; Note: Never use this feature for production boxes. -;html_errors = Off - -; If html_errors is set On PHP produces clickable error messages that direct -; to a page describing the error or function causing the error in detail. -; You can download a copy of the PHP manual from http://www.php.net/docs.php -; and change docref_root to the base URL of your local copy including the -; leading '/'. You must also specify the file extension being used including -; the dot. -; Note: Never use this feature for production boxes. -;docref_root = "/phpmanual/" -;docref_ext = .html - -; String to output before an error message. -;error_prepend_string = "" - -; String to output after an error message. -;error_append_string = "" - -; Log errors to specified file. -;error_log = filename - -; Log errors to syslog (Event Log on NT, not valid in Windows 95). -error_log = syslog - - -;;;;;;;;;;;;;;;;; -; Data Handling ; -;;;;;;;;;;;;;;;;; -; -; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 - -; The separator used in PHP generated URLs to separate arguments. -; Default is "&". -;arg_separator.output = "&" - -; List of separator(s) used by PHP to parse input URLs into variables. -; Default is "&". -; NOTE: Every character in this directive is considered as separator! -;arg_separator.input = ";&" - -; This directive describes the order in which PHP registers GET, POST, Cookie, -; Environment and Built-in variables (G, P, C, E & S respectively, often -; referred to as EGPCS or GPC). Registration is done from left to right, newer -; values override older values. +error_log = /var/log/php.log variables_order = "EGPCS" - -; Whether or not to register the EGPCS variables as global variables. You may -; want to turn this off if you don't want to clutter your scripts' global scope -; with user data. This makes most sense when coupled with track_vars - in which -; case you can access all of the GPC variables through the $HTTP_*_VARS[], -; variables. -; -; You should do your best to write your scripts so that they do not require -; register_globals to be on; Using form variables as globals can easily lead -; to possible security problems, if the code is not very well thought of. register_globals = Off - -; This directive tells PHP whether to declare the argv&argc variables (that -; would contain the GET information). If you don't use these variables, you -; should turn it off for increased performance. register_argc_argv = On - -; Maximum size of POST data that PHP will accept. -post_max_size = 8M - -; Magic quotes -; - -; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc. +post_max_size = 64M magic_quotes_runtime = Off - -; Use Sybase-style magic quotes (escape ' with '' instead of \'). magic_quotes_sybase = Off - -; Automatically add files before or after any PHP document. auto_prepend_file = auto_append_file = - -; As of 4.0b4, PHP always outputs a character encoding by default in -; the Content-type: header. To disable sending of the charset, simply -; set it to be empty. -; -; PHP's built-in default is text/html default_mimetype = "text/html" -;default_charset = "iso-8859-1" - -; Always populate the $HTTP_RAW_POST_DATA variable. -;always_populate_raw_post_data = On - - -;;;;;;;;;;;;;;;;;;;;;;;;; -; Paths and Directories ; -;;;;;;;;;;;;;;;;;;;;;;;;; - -; UNIX: "/path1:/path2" -;include_path = ".:/php/includes" -; -; Windows: "\path1;\path2" -;include_path = ".;c:\php\includes" - -; The root of the PHP pages, used only if nonempty. -; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root -; if you are running php as a CGI under any web server (other than IIS) -; see documentation for security issues. The alternate is to use the -; cgi.force_redirect configuration below -; lighttpd: must be the same as server.document-root -;doc_root = /srv/www/htdocs - -; The directory under which PHP opens the script using /~username used only -; if nonempty. user_dir = - -; Directory in which the loadable extensions (modules) reside. extension_dir = "/usr/lib/php" - -; Whether or not to enable the dl() function. The dl() function does NOT work -; properly in multithreaded servers, such as IIS or Zeus, and is automatically -; disabled on them. enable_dl = On - -; cgi.force_redirect is necessary to provide security running PHP as a CGI under -; most web servers. Left undefined, PHP turns this on by default. You can -; turn it off here AT YOUR OWN RISK -; **You CAN safely turn this off for IIS, in fact, you MUST.** -; cgi.force_redirect = 1 - -; if cgi.nph is enabled it will force cgi to always sent Status: 200 with -; every request. -; cgi.nph = 1 - -; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape -; (iPlanet) web servers, you MAY need to set an environment variable name that PHP -; will look for to know it is OK to continue execution. Setting this variable MAY -; cause security issues, KNOW WHAT YOU ARE DOING FIRST. -; cgi.redirect_status_env = ; - -; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate -; security tokens of the calling client. This allows IIS to define the -; security context that the request runs under. mod_fastcgi under Apache -; does not currently support this feature (03/17/2002) -; Set to 1 if running under IIS. Default is zero. -; fastcgi.impersonate = 1; - -; cgi.rfc2616_headers configuration option tells PHP what type of headers to -; use when sending HTTP response code. If it's set 0 PHP sends Status: header that -; is supported by Apache. When this option is set to 1 PHP will send -; RFC2616 compliant header. -; Default is zero. -;cgi.rfc2616_headers = 0 - - -;;;;;;;;;;;;;;;; -; File Uploads ; -;;;;;;;;;;;;;;;; - -; Whether to allow HTTP file uploads. file_uploads = On - -; Temporary directory for HTTP uploaded files (will use system default if not -; specified). upload_tmp_dir = /tmp - -; Maximum allowed size for uploaded files. -upload_max_filesize = 2M - - -;;;;;;;;;;;;;;;;;; -; Fopen wrappers ; -;;;;;;;;;;;;;;;;;; - -; Whether to allow the treatment of URLs (like http:// or ftp://) as files. +upload_max_filesize = 64M allow_url_fopen = On - -; Define the anonymous ftp password (your email address) -;from="john@doe.com" - -; Define the User-Agent string -; user_agent="PHP" - -; Default timeout for socket based streams (seconds) default_socket_timeout = 60 -; If your scripts have to deal with files from Macintosh systems, -; or you are running on a Mac and need to deal with files from -; unix or win32 systems, setting this flag will cause PHP to -; automatically detect the EOL character in those files so that -; fgets() and file() will work regardless of the source of the file. -; auto_detect_line_endings = Off - - -;;;;;;;;;;;;;;;;;;;;;; -; Dynamic Extensions ; -;;;;;;;;;;;;;;;;;;;;;; -; -; If you wish to have an extension loaded automatically, use the following -; syntax: -; -; extension=modulename.extension -; -; For example, on Windows: -; -; extension=msql.dll -; -; ... or under UNIX: -; -; extension=msql.so -; -; Note that it should be the name of the module only; no directory information -; needs to go here. Specify the location of the extension with the -; extension_dir directive above. - - -;Windows Extensions -;Note that ODBC support is built in, so no dll is needed for it. -; - -;extension=ftp.so -;extension=gd.so -;extension=mysql.so -;extension=pcre.so -;extension=session.so -;extension=sockets.so -;extension=xml.so - - - - -;;;;;;;;;;;;;;;;;;; -; Module Settings ; -;;;;;;;;;;;;;;;;;;; - [SQL] sql.safe_mode = Off [Session] -; Handler used to store/retrieve data. session.save_handler = files - -; Argument passed to save_handler. In the case of files, this is the path -; where data files are stored. Note: Windows users have to change this -; variable in order to use PHP's session functions. -; -; As of PHP 4.0.1, you can define the path as: -; -; session.save_path = "N;/path" -; -; where N is an integer. Instead of storing all the session files in -; /path, what this will do is use subdirectories N-levels deep, and -; store the session data in those directories. This is useful if you -; or your OS have problems with lots of files in one directory, and is -; a more efficient layout for servers that handle lots of sessions. -; -; NOTE 1: PHP will not create this directory structure automatically. -; You can use the script in the ext/session dir for that purpose. -; NOTE 2: See the section on garbage collection below if you choose to -; use subdirectories for session storage -; -; The file storage module creates files using mode 600 by default. -; You can change that by using -; -; session.save_path = "N;MODE;/path" -; -; where MODE is the octal representation of the mode. Note that this -; does not overwrite the process's umask. session.save_path = "/tmp" - -; Whether to use cookies. session.use_cookies = 1 - -; This option enables administrators to make their users invulnerable to -; attacks which involve passing session ids in URLs; defaults to 0. -; session.use_only_cookies = 1 - -; Name of the session (used as cookie name). session.name = PHPSESSID - -; Initialize session on request startup. session.auto_start = 0 - -; Lifetime in seconds of cookie or, if 0, until browser is restarted. session.cookie_lifetime = 0 - -; The path for which the cookie is valid. session.cookie_path = / - -; The domain for which the cookie is valid. session.cookie_domain = - -; Handler used to serialize data. php is the standard serializer of PHP. session.serialize_handler = php - -; Define the probability that the 'garbage collection' process is started -; on every session initialization. -; The probability is calculated by using gc_probability/gc_divisor, -; e.g. 1/100 means there is a 1% chance that the GC process starts -; on each request. - session.gc_probability = 1 session.gc_divisor = 100 - -; After this number of seconds, stored data will be seen as 'garbage' and -; cleaned up by the garbage collection process. session.gc_maxlifetime = 1440 - -; NOTE: If you are using the subdirectory option for storing session files -; (see session.save_path above), then garbage collection does *not* -; happen automatically. You will need to do your own garbage -; collection through a shell script, cron entry, or some other method. -; For example, the following script would is the equivalent of -; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): -; cd /path/to/sessions; find -cmin +24 | xargs rm - -; PHP 4.2 and less have an undocumented feature/bug that allows you to -; to initialize a session variable in the global scope, albeit register_globals -; is disabled. PHP 4.3 and later will warn you, if this feature is used. -; You can disable the feature and the warning separately. At this time, -; the warning is only displayed, if bug_compat_42 is enabled. - session.bug_compat_42 = 1 session.bug_compat_warn = 1 - -; Check HTTP Referer to invalidate externally stored URLs containing ids. -; HTTP_REFERER has to contain this substring for the session to be -; considered as valid. session.referer_check = - -; How many bytes to read from the file. session.entropy_length = 0 - -; Specified here to create the session id. session.entropy_file = - -;session.entropy_length = 16 - -;session.entropy_file = /dev/urandom - -; Set to {nocache,private,public,} to determine HTTP caching aspects -; or leave this empty to avoid sending anti-caching headers. session.cache_limiter = nocache - -; Document expires after n minutes. session.cache_expire = 180 - -; trans sid support is disabled by default. -; Use of trans sid may risk your users security. -; Use this option with caution. -; - User may send URL contains active session ID -; to other person via. email/irc/etc. -; - URL that contains active session ID may be stored -; in publically accessible computer. -; - User may access your site with the same session ID -; always using URL stored in browser's history or bookmarks. session.use_trans_sid = 0 - -; Select a hash function -; 0: MD5 (128 bits) -; 1: SHA-1 (160 bits) session.hash_function = 0 - -; Define how many bits are stored in each character when converting -; the binary hash data to something readable. -; -; 4 bits: 0-9, a-f -; 5 bits: 0-9, a-v -; 6 bits: 0-9, a-z, A-Z, "-", "," session.hash_bits_per_character = 4 - -; The URL rewriter will look for URLs in a defined set of HTML tags. -; form/fieldset are special; if you include them here, the rewriter will -; add a hidden field with the info which is otherwise appended -; to URLs. If you want XHTML conformity, remove the form entry. -; Note that all valid entries require a "=", even if no value follows. url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=,fieldset=" - - -[Assertion] -; Assert(expr); active by default. -;assert.active = On - -; Issue a PHP warning for each failed assertion. -;assert.warning = On - -; Don't bail out by default. -;assert.bail = Off - -; User-function to be called if an assertion fails. -;assert.callback = 0 - -; Eval the expression with current error_reporting(). Set to true if you want -; error_reporting(0) around the eval(). -;assert.quiet_eval = 0 - - - - - -[exif] -; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. -; With mbstring support this will automatically be converted into the encoding -; given by corresponding encode setting. When empty mbstring.internal_encoding -; is used. For the decode settings you can distinguish between motorola and -; intel byte order. A decode setting cannot be empty. -;exif.encode_unicode = ISO-8859-15 -;exif.decode_unicode_motorola = UCS-2BE -;exif.decode_unicode_intel = UCS-2LE -;exif.encode_jis = -;exif.decode_jis_motorola = JIS -;exif.decode_jis_intel = JIS - diff --git a/package/php/files/php.init b/package/php/files/php.init index 926e125e0..b2e60135b 100644 --- a/package/php/files/php.init +++ b/package/php/files/php.init @@ -13,10 +13,18 @@ autostart) exec sh $0 start ;; start) - /usr/bin/php ${php_flags} & + if [ -x /usr/bin/php-cgi ];then + /usr/bin/php-cgi + else + /usr/bin/php-fpm -D + fi ;; stop) - for i in $(pgrep -f /usr/bin/php);do kill -9 $i;done + if [ -x /usr/bin/php-cgi ];then + pkill php-cgi + else + pkill php-fpm + fi ;; restart) sh $0 stop -- cgit v1.2.3 From ac0122005e1a0b8f86b3ae60dbdec77f40cdd45d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 5 Feb 2015 16:04:19 +0100 Subject: run as www with socket --- package/php/files/php.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/php/files/php.init b/package/php/files/php.init index b2e60135b..786284b46 100644 --- a/package/php/files/php.init +++ b/package/php/files/php.init @@ -14,7 +14,7 @@ autostart) ;; start) if [ -x /usr/bin/php-cgi ];then - /usr/bin/php-cgi + su -m www -c "/usr/bin/php-cgi -b /var/run/php5.sock" else /usr/bin/php-fpm -D fi -- cgit v1.2.3 From 319ac4b072b54f347a3518289b55f81e3090a250 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 6 Feb 2015 01:48:24 -0600 Subject: rework CMDLINE generation regarding serial/vga Use one place and not hard coded for each device. There exist use cases where on a specific device like raspberry pi, not the default 115200 baud rate is used. --- rules.mk | 1 + target/Makefile | 8 +++ target/aarch64/systems/arm-fm | 1 + target/arm/systems/linksys-nslu2 | 1 + target/arm/systems/raspberry-pi | 1 + target/arm/systems/sharp-zaurus | 1 + target/arm/systems/solidrun-imx6 | 1 + target/avr32/systems/atmel-ngw100 | 3 +- target/config/Config.in | 1 + target/config/Config.in.adk | 35 ++++------ target/config/Config.in.hardware | 65 +++++++++--------- target/config/Config.in.qemuopts | 26 ++++---- target/config/Config.in.runtime | 127 ++++++++++++++++++------------------ target/config/Config.in.target | 32 +-------- target/config/Config.in.x86.choice | 8 +-- target/config/Config.in.x86.default | 8 +-- target/mips/systems/dragino-ms14s | 1 + target/mips/systems/mikrotik-rb4xx | 1 + target/mips/systems/mikrotik-rb532 | 1 + target/x86_64/systems/pcengines-apu | 1 + 20 files changed, 157 insertions(+), 166 deletions(-) diff --git a/rules.mk b/rules.mk index 64b07caf4..8eb0879ce 100644 --- a/rules.mk +++ b/rules.mk @@ -48,6 +48,7 @@ ADK_QEMU_ARGS:= $(strip $(subst ",, $(ADK_QEMU_ARGS))) ADK_RUNTIME_TMPFS_SIZE:= $(strip $(subst ",, $(ADK_RUNTIME_TMPFS_SIZE))) ADK_RUNTIME_CONSOLE_SERIAL_SPEED:= $(strip $(subst ",, $(ADK_RUNTIME_CONSOLE_SERIAL_SPEED))) ADK_RUNTIME_CONSOLE_SERIAL_DEVICE:= $(strip $(subst ",, $(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE))) +ADK_RUNTIME_CONSOLE_VGA_DEVICE:= $(strip $(subst ",, $(ADK_RUNTIME_CONSOLE_VGA_DEVICE))) ADK_HOST:= $(strip $(subst ",, $(ADK_HOST))) ADK_VENDOR:= $(strip $(subst ",, $(ADK_VENDOR))) ADK_DL_DIR:= $(strip $(subst ",, $(ADK_DL_DIR))) diff --git a/target/Makefile b/target/Makefile index d015d6757..e6bbe9ef4 100644 --- a/target/Makefile +++ b/target/Makefile @@ -36,6 +36,14 @@ config-prepare: $(ADK_TOPDIR)/.config echo "no miniconfig found for target system"; \ exit 1; \ fi +ifneq ($(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE),) + $(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE),$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)"#' \ + $(BUILD_DIR)/.kernelconfig.board +endif +ifneq ($(ADK_RUNTIME_CONSOLE_VGA_DEVICE),) + $(SED) 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=$(ADK_RUNTIME_CONSOLE_VGA_DEVICE)"#' \ + $(BUILD_DIR)/.kernelconfig.board +endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_M68K),y) @$(SED) 's#^\(CONFIG_.*BOOTPARAM_STRING="\)\(.*\)"#\1\2 ro $(FS_CMDLINE)"#' \ $(BUILD_DIR)/.kernelconfig.board diff --git a/target/aarch64/systems/arm-fm b/target/aarch64/systems/arm-fm index 4eef2aeaf..d1f838bc2 100644 --- a/target/aarch64/systems/arm-fm +++ b/target/aarch64/systems/arm-fm @@ -9,5 +9,6 @@ config ADK_TARGET_SYSTEM_ARM_FM select ADK_LINUX_64 select ADK_TARGET_KERNEL_IMAGE select ADK_PACKAGE_BOOT_WRAPPER_AARCH64 + select ADK_TARGET_WITH_SERIAL help Support for ARMv8 Foundation Model (aarch64). diff --git a/target/arm/systems/linksys-nslu2 b/target/arm/systems/linksys-nslu2 index dd72c5cae..8e3199607 100644 --- a/target/arm/systems/linksys-nslu2 +++ b/target/arm/systems/linksys-nslu2 @@ -5,6 +5,7 @@ config ADK_TARGET_SYSTEM_LINKSYS_NSLU2 select ADK_eabihf select ADK_linksys_nslu2 select ADK_TARGET_WITH_USB + select ADK_TARGET_WITH_SERIAL select ADK_TARGET_KERNEL_ZIMAGE help Linksys NSLU2 diff --git a/target/arm/systems/raspberry-pi b/target/arm/systems/raspberry-pi index c0f375f68..16ef7758e 100644 --- a/target/arm/systems/raspberry-pi +++ b/target/arm/systems/raspberry-pi @@ -8,6 +8,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_CPU_ARM1176JZF_S select ADK_TARGET_CPU_WITH_FPU select ADK_TARGET_WITH_VGA + select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_CPU_FREQ select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_INPUT diff --git a/target/arm/systems/sharp-zaurus b/target/arm/systems/sharp-zaurus index 195ed9c0e..fa93110a0 100644 --- a/target/arm/systems/sharp-zaurus +++ b/target/arm/systems/sharp-zaurus @@ -7,6 +7,7 @@ config ADK_TARGET_SYSTEM_SHARP_ZAURUS select ADK_CPU_XSCALE select ADK_TARGET_CPU_WITH_IWMMXT select ADK_TARGET_WITH_VGA + select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_PCMCIA select ADK_TARGET_WITH_INPUT select ADK_TARGET_WITH_SOUND diff --git a/target/arm/systems/solidrun-imx6 b/target/arm/systems/solidrun-imx6 index 38e80e70f..d602c905b 100644 --- a/target/arm/systems/solidrun-imx6 +++ b/target/arm/systems/solidrun-imx6 @@ -8,6 +8,7 @@ config ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 select ADK_CPU_CORTEX_A9 select ADK_TARGET_CPU_WITH_FPU select ADK_TARGET_WITH_VGA + select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_CPU_FREQ select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_SD diff --git a/target/avr32/systems/atmel-ngw100 b/target/avr32/systems/atmel-ngw100 index 8d6aba14c..b5dd60c8a 100644 --- a/target/avr32/systems/atmel-ngw100 +++ b/target/avr32/systems/atmel-ngw100 @@ -5,6 +5,7 @@ config ADK_TARGET_SYSTEM_ATMEL_NGW100 select ADK_CPU_AVR32 select ADK_TARGET_KERNEL_UIMAGE select ADK_HOST_BUILD_U_BOOT + select ADK_TARGET_WITH_SERIAL help - ATMEL NGW100 + Atmel NGW100 diff --git a/target/config/Config.in b/target/config/Config.in index 16d834e0a..dcef7ad51 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -21,6 +21,7 @@ config ADK_TARGET_UCLINUX config ADK_TARGET_QEMU bool + select ADK_TARGET_WITH_SERIAL config ADK_TARGET_VBOX bool diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk index 07fe735ce..86f38c2dd 100644 --- a/target/config/Config.in.adk +++ b/target/config/Config.in.adk @@ -63,60 +63,51 @@ config ADK_MAKE_JOBS default 1 if ! ADK_MAKE_PARALLEL config ADK_MAKE_PARALLEL - prompt "Enable parallel building of packages" - boolean + bool "Enable parallel building of packages" default y config ADK_MAKE_JOBS - prompt "How many jobs to use" - int + int "How many jobs to use" default 4 depends on ADK_MAKE_PARALLEL help The number specified here will be passed to make as N in '-jN' config ADK_TARGET_IP - prompt "Set target ip address for make check" - string + string "Set target ip address for make check" default "127.0.0.1" help + IP address of target, when running make check. config ADK_TARGET_PORT - prompt "Set target port for make check" - string + string "Set target port for make check" default "2222" if ADK_TARGET_QEMU default "22" help + Port to use for SSH when running make check. choice prompt "Hostsystem (do not change!)" config ADK_HOST_LINUX - prompt "Linux" - boolean + bool "Linux" config ADK_HOST_FREEBSD - prompt "FreeBSD" - boolean + bool "FreeBSD" config ADK_HOST_MIRBSD - prompt "MirBSD" - boolean + bool "MirBSD" config ADK_HOST_OPENBSD - prompt "OpenBSD" - boolean + bool "OpenBSD" config ADK_HOST_NETBSD - prompt "NetBSD" - boolean + bool "NetBSD" config ADK_HOST_DARWIN - prompt "Darwin" - boolean + bool "Darwin" config ADK_HOST_CYGWIN - prompt "Cygwin" - boolean + bool "Cygwin" endchoice endmenu diff --git a/target/config/Config.in.hardware b/target/config/Config.in.hardware index 8406e3e37..fdb35d15e 100644 --- a/target/config/Config.in.hardware +++ b/target/config/Config.in.hardware @@ -3,94 +3,97 @@ # hardware features, do not use for qemu config ADK_TARGET_WITH_CPU_FREQ - boolean + bool config ADK_TARGET_WITH_USB - boolean + bool config ADK_TARGET_WITH_I2C - boolean + bool config ADK_TARGET_WITH_SPI - boolean + bool config ADK_TARGET_WITH_PCI - boolean + bool config ADK_TARGET_WITH_SSB - boolean + bool config ADK_TARGET_WITH_SDIO - boolean + bool config ADK_TARGET_WITH_AHB - boolean + bool config ADK_TARGET_WITH_MINIPCI - boolean + bool config ADK_TARGET_WITH_ACPI - boolean + bool config ADK_TARGET_WITH_VGA - boolean + bool + +config ADK_TARGET_WITH_SERIAL + bool config ADK_TARGET_WITH_NAND - boolean + bool config ADK_TARGET_WITH_SD - boolean + bool config ADK_TARGET_WITH_MTD - boolean + bool config ADK_TARGET_WITH_GEODE_CRYPTO - boolean + bool config ADK_TARGET_WITH_PATA - boolean + bool config ADK_TARGET_WITH_SATA - boolean + bool config ADK_TARGET_WITH_SCSI - boolean + bool config ADK_TARGET_WITH_INPUT - boolean + bool config ADK_TARGET_WITH_SOUND - boolean + bool config ADK_TARGET_WITH_TOUCHSCREEN - boolean + bool config ADK_TARGET_WITH_LEDS - boolean + bool config ADK_TARGET_WITH_PP - boolean + bool config ADK_TARGET_WITH_CARDBUS - boolean + bool config ADK_TARGET_WITH_PCMCIA - boolean + bool config ADK_TARGET_WITH_RTC - boolean + bool config ADK_TARGET_WITH_WATCHDOG - boolean + bool config ADK_TARGET_WITH_WIFI - boolean + bool config ADK_TARGET_WITH_DSL - boolean + bool config ADK_TARGET_WITH_USB_BOOT - boolean + bool config ADK_TARGET_WITH_SMP - boolean + bool diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts index f3c0af9c7..b869202e2 100644 --- a/target/config/Config.in.qemuopts +++ b/target/config/Config.in.qemuopts @@ -11,18 +11,19 @@ config ADK_QEMU_ARGS default "-nographic" config ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY - boolean + bool + select ADK_TARGET_WITH_VGA depends on ADK_TARGET_QEMU_ARM_MODEL_SPITZ || ADK_TARGET_QEMU_ARM_MODEL_TERRIER choice -prompt "Use a Bootloader" +prompt "Bootloader" depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86 config ADK_TARGET_QEMU_WITHOUT_BOOTLOADER - boolean "do not use bootloader" + bool "do not use bootloader" config ADK_TARGET_QEMU_WITH_BOOTLOADER - boolean "use bootloader" + bool "use bootloader" select ADK_PACKAGE_GRUB if ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86 endchoice @@ -35,10 +36,10 @@ default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_SQUASHFS default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_JFFS2 config ADK_TARGET_QEMU_WITHOUT_BLOCK - boolean "disabled" + bool "disabled" config ADK_TARGET_QEMU_WITH_BLOCK - boolean "enabled" + bool "enabled" select ADK_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 select ADK_KERNEL_ATA_PIIX if ADK_TARGET_SYSTEM_QEMU_MIPS || ADK_TARGET_SYSTEM_QEMU_MIPS64 || ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64 @@ -56,10 +57,11 @@ prompt "Qemu Emulation with graphical output" depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_SH config ADK_TARGET_QEMU_WITHOUT_GRAPHIC - boolean "disabled" + bool "disabled" config ADK_TARGET_QEMU_WITH_GRAPHIC - boolean "enabled" + bool "enabled" + select ADK_TARGET_WITH_VGA select ADK_KERNEL_VT select ADK_KERNEL_VT_CONSOLE select ADK_KERNEL_FONTS @@ -88,10 +90,10 @@ depends on ADK_TARGET_SYSTEM_QEMU_SPARC64 || \ default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_AARCH64 config ADK_TARGET_QEMU_WITHOUT_VIRTIO - boolean "disabled" + bool "disabled" config ADK_TARGET_QEMU_WITH_VIRTIO - boolean "enabled" + bool "enabled" select ADK_KERNEL_VIRTIO select ADK_KERNEL_VIRTIO_PCI select ADK_KERNEL_VIRTIO_NET @@ -105,10 +107,10 @@ prompt "Qemu Emulation with audio support" depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86 config ADK_TARGET_QEMU_WITHOUT_AUDIO - boolean "disabled" + bool "disabled" config ADK_TARGET_QEMU_WITH_AUDIO - boolean "enabled" + bool "enabled" endchoice endmenu diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 009ea1eb0..6721f5c2d 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -9,8 +9,8 @@ config ADK_RUNTIME_HOSTNAME config ADK_RUNTIME_SSH_PUBKEY string "SSH public key (root user only)" - default "" depends on ADK_PACKAGE_OPENSSH_SERVER || ADK_PACKAGE_DROPBEAR + default "" help Paste your generated SSH public key here and it will be embedded into the built image, so you can use it to login instantly. @@ -22,10 +22,10 @@ config ADK_RUNTIME_PASSWORD Predefine the root password enabled in the built image. config ADK_RUNTIME_START_SERVICES - prompt "start services by default" - boolean + bool "start services by default" default n help + Enable this option to start selected services on boot. source "target/config/Config.in.scripts" @@ -49,56 +49,52 @@ config ADK_RUNTIME_TIMEZONE Predefine the timezone for the embedded system. config ADK_QUIET_KERNEL - prompt "make bootup quiet without messages from the kernel" - boolean - default n + bool "make bootup quiet without messages from the kernel" help Make bootup quiet without messages from the kernel. choice prompt "bootup messages from initscripts" -default ADK_RUNTIME_QUIET_INIT if ADK_PKG_KODIBOX -default ADK_RUNTIME_VERBOSE_INIT_VGA if ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC || ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY || ADK_TARGET_VBOX +default ADK_RUNTIME_VERBOSE_INIT_VGA if ADK_TARGET_WITH_VGA default ADK_RUNTIME_VERBOSE_INIT_SERIAL config ADK_RUNTIME_VERBOSE_INIT_VGA - depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC || ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY || ADK_TARGET_VBOX - boolean "output via VGA" + bool "output via VGA" + depends on ADK_TARGET_WITH_VGA config ADK_RUNTIME_VERBOSE_INIT_SERIAL - boolean "output via serial" + bool "output via serial" + depends on ADK_TARGET_WITH_SERIAL config ADK_RUNTIME_QUIET_INIT - boolean "no output" + bool "no output" endchoice choice prompt "start getty or shell after bootup" -default ADK_RUNTIME_SHELL if ADK_PKG_TEST -default ADK_RUNTIME_NONE if ADK_PKG_KODIBOX default ADK_RUNTIME_GETTY config ADK_RUNTIME_GETTY - boolean "start a getty after bootup" + bool "start a getty after bootup" help Start a getty after bootup. config ADK_RUNTIME_SHELL - boolean "start a shell after bootup" + bool "start a shell after bootup" help - Start a shell after bootup + Start a shell after bootup. config ADK_RUNTIME_NONE - boolean "start no shell nor getty after bootup" + bool "start no shell nor getty after bootup" help - Do not start a shell or getty after bootup + Do not start a shell or getty after bootup. endchoice config ADK_RUNTIME_GETTY_VGA - boolean "start getty on VGA console (tty1-tty6)" - depends on ADK_RUNTIME_GETTY + bool "start getty on VGA console (tty1-tty6)" + depends on ADK_RUNTIME_GETTY && ADK_TARGET_WITH_VGA default y if ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY default y if ADK_TARGET_QEMU_WITH_GRAPHIC default y if ADK_TARGET_SYSTEM_RASPBERRY_PI @@ -112,8 +108,8 @@ config ADK_RUNTIME_GETTY_VGA Start getty on VGA console. (tty1-tty6) config ADK_RUNTIME_GETTY_SERIAL - boolean "start getty on serial console" - depends on ADK_RUNTIME_GETTY + bool "start getty on serial console" + depends on ADK_RUNTIME_GETTY && ADK_TARGET_WITH_SERIAL default n if ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY default n if ADK_TARGET_QEMU_WITH_GRAPHIC default n if ADK_TARGET_SYSTEM_RASPBERRY_PI @@ -126,9 +122,15 @@ config ADK_RUNTIME_GETTY_SERIAL help Start getty on serial console. +config ADK_RUNTIME_CONSOLE_VGA_DEVICE + string "VGA console device" + depends on ADK_TARGET_WITH_VGA + default "tty1" if ADK_TARGET_SYSTEM_RASPBERRY_PI + default "tty0" + config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE - prompt "serial console device" - string + string "serial console device" + depends on ADK_TARGET_WITH_SERIAL default "hvc0" if ADK_TARGET_SYSTEM_QEMU_PPC64 default "ttyUL0" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 default "ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB || ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 || ADK_TARGET_SYSTEM_ARM_FM || ADK_TARGET_SYSTEM_QEMU_AARCH64 @@ -138,16 +140,16 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE default "ttyS0" config ADK_RUNTIME_CONSOLE_SERIAL_SPEED - prompt "serial console speed" - string + string "serial console speed" + depends on ADK_TARGET_WITH_SERIAL default "9600" if ADK_TARGET_SYSTEM_FON_FON2100 default "38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP default "115200" config ADK_RUNTIME_KBD_LAYOUT string "keyboard layout for the embedded system" - default "" depends on ADK_TARGET_WITH_INPUT + default "" help Predefine the keyboard layout for the embedded system. @@ -157,48 +159,48 @@ default ADK_ROOTSH_SASH if ADK_TARGET_UCLINUX default ADK_ROOTSH_MKSH config ADK_ROOTSH_MKSH - select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY bool "mksh (MirBSD Korn Shell)" + select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY help Use mksh (a Korn Shell variant) as standard login shell for the superuser. config ADK_ROOTSH_SASH - select ADK_PACKAGE_SASH if !ADK_TOOLCHAIN_ONLY bool "sash (Shell compatible with non-MMU systems)" + select ADK_PACKAGE_SASH if !ADK_TOOLCHAIN_ONLY help standalone shell. config ADK_ROOTSH_HUSH - select ADK_PACKAGE_HUSH if !ADK_TOOLCHAIN_ONLY bool "hush (Shell compatible with non-MMU systems)" + select ADK_PACKAGE_HUSH if !ADK_TOOLCHAIN_ONLY help hush shell from busybox. config ADK_ROOTSH_ASH - select BUSYBOX_ASH bool "ash (busybox)" + select BUSYBOX_ASH help Use the minimalistic ash variant that is part of busybox as standard login shell for the superuser. This is the default, but discouraged due to its frugality. config ADK_ROOTSH_BASH - select ADK_PACKAGE_BASH bool "bash (GNU Bourne-Again Shell)" + select ADK_PACKAGE_BASH help Use GNU bash as standard login shell for the superuser. config ADK_ROOTSH_TCSH - select ADK_PACKAGE_TCSH bool "tcsh (Tenex C Shell)" + select ADK_PACKAGE_TCSH help Use tcsh (a C Shell variant) as standard login shell for the superuser. config ADK_ROOTSH_ZSH - select ADK_PACKAGE_ZSH bool "zsh (The Z Shell)" + select ADK_PACKAGE_ZSH help Use zsh as standard login shell for the superuser. @@ -210,50 +212,49 @@ default ADK_BINSH_SASH if ADK_TARGET_UCLINUX default ADK_BINSH_MKSH config ADK_BINSH_MKSH - select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY bool "mksh (MirBSD Korn Shell)" + select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY help Use mksh (a Korn Shell variant) as system shell, which is both small and powerful, so quite suited for this task. config ADK_BINSH_SASH - select ADK_PACKAGE_SASH if !ADK_TOOLCHAIN_ONLY bool "sash (Standalone Shell)" + select ADK_PACKAGE_SASH if !ADK_TOOLCHAIN_ONLY help hush shell. config ADK_BINSH_HUSH - select ADK_PACKAGE_HUSH if !ADK_TOOLCHAIN_ONLY bool "hush (busybox)" + select ADK_PACKAGE_HUSH if !ADK_TOOLCHAIN_ONLY help hush shell. config ADK_BINSH_ASH - select BUSYBOX_ASH bool "ash (busybox)" + select BUSYBOX_ASH help Use the minimalistic ash variant that is part of busybox as system shell. This is the default and rather small and fast, but lacks scripting features. config ADK_BINSH_BASH - select ADK_PACKAGE_BASH bool "bash (GNU Bourne-Again Shell)" + select ADK_PACKAGE_BASH help Use GNU bash as system shell. This is discouraged due to its size and slowness. config ADK_BINSH_ZSH - select ADK_PACKAGE_ZSH bool "zsh (The Z Shell)" + select ADK_PACKAGE_ZSH help Use zsh as system shell. This is probably a bad idea. endchoice config ADK_SIMPLE_NETWORK_CONFIG - prompt "simple network configuration" - boolean + bool "simple network configuration" help Manually change network config @@ -272,6 +273,7 @@ config ADK_SIMPLE_NETWORK_CONFIG_ETH0_DHCP config ADK_SIMPLE_NETWORK_CONFIG_ETH0_NONE bool "no configuration" + endchoice choice @@ -279,26 +281,26 @@ prompt "configure default Gateway" depends on ADK_SIMPLE_NETWORK_CONFIG_ETH0_STATIC config ADK_SIMPLE_NETWORK_CONFIG_ETH0_STATIC_WITH_GW - boolean "with Gateway" + bool "with Gateway" config ADK_SIMPLE_NETWORK_CONFIG_ETH0_STATIC_WITHOUT_GW - boolean "without Gateway" + bool "without Gateway" endchoice config ADK_SIMPLE_NETWORK_CONFIG_ETH0_IP - depends on ADK_SIMPLE_NETWORK_CONFIG_ETH0_STATIC string "IP Address" + depends on ADK_SIMPLE_NETWORK_CONFIG_ETH0_STATIC default "10.0.0.2" config ADK_SIMPLE_NETWORK_CONFIG_ETH0_NM - depends on ADK_SIMPLE_NETWORK_CONFIG_ETH0_STATIC string "Netmask" + depends on ADK_SIMPLE_NETWORK_CONFIG_ETH0_STATIC default "255.255.255.0" config ADK_SIMPLE_NETWORK_CONFIG_ETH0_GW - depends on ADK_SIMPLE_NETWORK_CONFIG_ETH0_STATIC_WITH_GW string "Gateway" + depends on ADK_SIMPLE_NETWORK_CONFIG_ETH0_STATIC_WITH_GW default "10.0.0.1" endmenu @@ -327,26 +329,26 @@ prompt "configure default Gateway" depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC_WITH_GW - boolean "with Gateway" + bool "with Gateway" config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC_WITHOUT_GW - boolean "without Gateway" + bool "without Gateway" endchoice config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_IP - depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC string "IP Address" + depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC default "192.168.1.2" config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_NM - depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC string "Netmask" + depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC default "255.255.255.0" config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_GW - depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC_WITH_GW string "Gateway" + depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_STATIC_WITH_GW default "192.168.1.1" endmenu @@ -365,13 +367,13 @@ config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2 endchoice config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2_SSID - depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2 string "SSID" + depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2 default "" config ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2_PW - depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2 string "Password" + depends on ADK_SIMPLE_NETWORK_CONFIG_WLAN0_WPA2 default "" menu "eth1 Configuration" @@ -390,6 +392,7 @@ config ADK_SIMPLE_NETWORK_CONFIG_ETH1_DHCP config ADK_SIMPLE_NETWORK_CONFIG_ETH1_NONE bool "no configuration" + endchoice choice @@ -397,40 +400,40 @@ prompt "configure default Gateway" depends on ADK_SIMPLE_NETWORK_CONFIG_ETH1_STATIC config ADK_SIMPLE_NETWORK_CONFIG_ETH1_STATIC_WITH_GW - boolean "with Gateway" + bool "with Gateway" config ADK_SIMPLE_NETWORK_CONFIG_ETH1_STATIC_WITHOUT_GW - boolean "without Gateway" + bool "without Gateway" endchoice config ADK_SIMPLE_NETWORK_CONFIG_ETH1_IP - depends on ADK_SIMPLE_NETWORK_CONFIG_ETH1_STATIC string "IP Address" + depends on ADK_SIMPLE_NETWORK_CONFIG_ETH1_STATIC default "172.16.0.2" config ADK_SIMPLE_NETWORK_CONFIG_ETH1_NM - depends on ADK_SIMPLE_NETWORK_CONFIG_ETH1_STATIC string "Netmask" + depends on ADK_SIMPLE_NETWORK_CONFIG_ETH1_STATIC default "255.255.0.0" config ADK_SIMPLE_NETWORK_CONFIG_ETH1_GW - depends on ADK_SIMPLE_NETWORK_CONFIG_ETH1_STATIC_WITH_GW string "Gateway" + depends on ADK_SIMPLE_NETWORK_CONFIG_ETH1_STATIC_WITH_GW default "172.16.0.1" endmenu config ADK_SIMPLE_NETWORK_CONFIG_NS + string "Nameserver" depends on ADK_SIMPLE_NETWORK_CONFIG depends on !ADK_SIMPLE_NETWORK_CONFIG_ETH0_DHCP depends on !ADK_SIMPLE_NETWORK_CONFIG_ETH1_DHCP depends on !ADK_SIMPLE_NETWORK_CONFIG_WLAN0_DHCP - string "Nameserver" default "10.0.0.1" config ADK_SIMPLE_NETWORK_CONFIG_PROXY - depends on ADK_SIMPLE_NETWORK_CONFIG string "HTTP-Proxy (f.e. http://10.0.0.2:8080)" + depends on ADK_SIMPLE_NETWORK_CONFIG default "" diff --git a/target/config/Config.in.target b/target/config/Config.in.target index 96057abb6..1a6129509 100644 --- a/target/config/Config.in.target +++ b/target/config/Config.in.target @@ -41,36 +41,8 @@ config ADK_TARGET_CFLAGS config ADK_TARGET_CMDLINE string - default "console=tty0" if ADK_TARGET_SYSTEM_ARANYM_M68K - default "console=ttyAMA0" if ADK_TARGET_SYSTEM_ARM_FM - default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 - default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 - default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_APU - default "console=ttymxc0,115200 console=tty0" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 && ADK_RUNTIME_VERBOSE_INIT_VGA - default "console=tty0 console=ttymxc0,115200" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 && ADK_RUNTIME_VERBOSE_INIT_SERIAL - default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40 && ADK_RUNTIME_VERBOSE_INIT_VGA - default "console=tty0 console=ttyS0,115200" if ADK_TARGET_SYSTEM_IBM_X40 && ADK_RUNTIME_VERBOSE_INIT_SERIAL - default "console=tty0" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default "console=ttyAMA0,115200 console=tty1" if ADK_TARGET_SYSTEM_RASPBERRY_PI && ADK_RUNTIME_VERBOSE_INIT_VGA - default "console=tty1 console=ttyAMA0,115200" if ADK_TARGET_SYSTEM_RASPBERRY_PI && ADK_RUNTIME_VERBOSE_INIT_SERIAL - default "console=ttyS0,115200 console=tty0 fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_FON_FON2100 - default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP - default "console=ttyS0,115200 console=tty0 geodewdt.nowayout=1" if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C - default "console=tty0" if ADK_TARGET_VBOX - default "console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ || ADK_TARGET_QEMU_ARM_MODEL_TERRIER - default "console=ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB - default "console=ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 - default "console=ttyUL0" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 - default "console=ttyS0,115200" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 - default "console=hvc0" if ADK_TARGET_SYSTEM_QEMU_PPC64 - default "console=ttyS0,9600" if ADK_TARGET_QEMU_PPC_MACPPC - default "console=ttyS0" if ADK_TARGET_QEMU_PPC_VIRTEX_ML507 - default "console=ttyS0" if ADK_TARGET_QEMU_PPC_BAMBOO - default "console=ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH - default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_QEMU_SPARC64 - default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64 - default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_QEMU_XTENSA + default "fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS + default "geodewdt.nowayout=1" if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default "" choice diff --git a/target/config/Config.in.x86.choice b/target/config/Config.in.x86.choice index c95768793..fb6b848d4 100644 --- a/target/config/Config.in.x86.choice +++ b/target/config/Config.in.x86.choice @@ -7,19 +7,19 @@ depends on (ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_GENERIC_PC || ADK_TA default ADK_CPU_I486 config ADK_CPU_I486 - boolean "i486" + bool "i486" select ADK_i486 config ADK_CPU_I586 - boolean "i586" + bool "i586" select ADK_i586 config ADK_CPU_I686 - boolean "i686" + bool "i686" select ADK_i686 config ADK_CPU_ATOM - boolean "atom" + bool "atom" select ADK_atom endchoice diff --git a/target/config/Config.in.x86.default b/target/config/Config.in.x86.default index 6001b030f..eb92bf3e1 100644 --- a/target/config/Config.in.x86.default +++ b/target/config/Config.in.x86.default @@ -2,16 +2,16 @@ # material, please see the LICENCE file in the top-level directory. config ADK_i486 - boolean + bool config ADK_i586 - boolean + bool config ADK_i686 - boolean + bool config ADK_atom - boolean + bool config ADK_TARGET_X86_CPU string diff --git a/target/mips/systems/dragino-ms14s b/target/mips/systems/dragino-ms14s index 6b1dd0368..d46bee961 100644 --- a/target/mips/systems/dragino-ms14s +++ b/target/mips/systems/dragino-ms14s @@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_DRAGINO_MS14S select ADK_CPU_MIPS32 select ADK_TARGET_WITH_WATCHDOG select ADK_TARGET_WITH_NAND + select ADK_TARGET_WITH_SERIAL help Support for Dragino2 ms14-s. diff --git a/target/mips/systems/mikrotik-rb4xx b/target/mips/systems/mikrotik-rb4xx index 41a901bb4..acb427c1b 100644 --- a/target/mips/systems/mikrotik-rb4xx +++ b/target/mips/systems/mikrotik-rb4xx @@ -5,6 +5,7 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB4XX select ADK_mikrotik_rb4xx select ADK_CPU_MIPS32 select ADK_TARGET_WITH_MINIPCI + select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_WATCHDOG select ADK_TARGET_WITH_NAND select ADK_TARGET_WITH_LEDS diff --git a/target/mips/systems/mikrotik-rb532 b/target/mips/systems/mikrotik-rb532 index 505abf651..3edda2d36 100644 --- a/target/mips/systems/mikrotik-rb532 +++ b/target/mips/systems/mikrotik-rb532 @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB532 select ADK_little select ADK_mikrotik_rb532 select ADK_CPU_MIPS32 + select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_MINIPCI select ADK_TARGET_WITH_WATCHDOG select ADK_TARGET_WITH_NAND diff --git a/target/x86_64/systems/pcengines-apu b/target/x86_64/systems/pcengines-apu index f95a9b21a..202cf7e9d 100644 --- a/target/x86_64/systems/pcengines-apu +++ b/target/x86_64/systems/pcengines-apu @@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_PCENGINES_APU select ADK_LINUX_64 select ADK_TARGET_KERNEL_BZIMAGE select ADK_TARGET_WITH_MINIPCI + select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_USB_BOOT select ADK_TARGET_WITH_ACPI -- cgit v1.2.3 From 28b1ec7d57938c07bbf37b56c0bff76fc7a47381 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 6 Feb 2015 01:57:43 -0600 Subject: use a hash in the config This avoids breakage when using a # in the password. And no sensitive data is saved in clear on the target. Suggested by a Achim Marikar. --- package/base-files/Makefile | 5 ++--- target/config/Config.in.runtime | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 827007550..9fd7903a6 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.1 -PKG_RELEASE:= 10 +PKG_RELEASE:= 11 PKG_SECTION:= base/apps PKG_DESCR:= basic files and scripts @@ -96,8 +96,7 @@ endif echo "ff02::2 ip6-allrouters" >> $(IDIR_BASE_FILES)/etc/hosts echo "ff02::3 ip6-allhosts" >> $(IDIR_BASE_FILES)/etc/hosts test -z '$(ADK_RUNTIME_PASSWORD)' || \ - $(SED) 's,\*NP\*,'"$$($(STAGING_HOST_DIR)/usr/bin/mkcrypt \ - $$(awk -F\= '/^ADK_RUNTIME_PASSWORD/ { print $$2 }' $(ADK_TOPDIR)/.config|sed -e 's^\"^^g')),g" \ + $(SED) 's,\*NP\*,'"$$(awk -F\= '/^ADK_RUNTIME_PASSWORD/ { print $$2 }' $(ADK_TOPDIR)/.config|sed -e 's^\"^^g')),g" \ $(IDIR_BASE_FILES)/etc/shadow echo $(ADK_RUNTIME_TMPFS_SIZE) > $(IDIR_BASE_FILES)/etc/tmpfs ifeq ($(ADK_TARGET_WITH_ROOT_RW),y) diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 6721f5c2d..0d8fae992 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -17,9 +17,11 @@ config ADK_RUNTIME_SSH_PUBKEY config ADK_RUNTIME_PASSWORD string "root password for the embedded system" - default "linux123" + default "$1$bJoW4DmS$7fUVat.9iFSAePzA4j4Jm." help Predefine the root password enabled in the built image. + Use ./host_x86_64-linux-gnu/usr/bin/mkcrypt to generate the hash. + Default password is linux123. config ADK_RUNTIME_START_SERVICES bool "start services by default" -- cgit v1.2.3 From cb486bbe603dbef1d4cca1601c110c6957287f00 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 Jan 2015 04:24:27 +0100 Subject: remove bkeymaps, does not work well anymore, use kbd package. reduce busybox tools in default config --- package/busybox/config/console-tools/Config.in | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/package/busybox/config/console-tools/Config.in b/package/busybox/config/console-tools/Config.in index 5a1dc29c4..ae1c7cbad 100644 --- a/package/busybox/config/console-tools/Config.in +++ b/package/busybox/config/console-tools/Config.in @@ -46,7 +46,6 @@ config BUSYBOX_DUMPKMAP config BUSYBOX_KBD_MODE bool "kbd_mode" default n - default y if ADK_TARGET_WITH_INPUT select BUSYBOX_PLATFORM_LINUX help This program reports and sets keyboard mode. @@ -60,7 +59,6 @@ config BUSYBOX_LOADFONT config BUSYBOX_LOADKMAP bool "loadkmap" - default y if ADK_TARGET_WITH_INPUT default n select BUSYBOX_PLATFORM_LINUX help @@ -84,7 +82,7 @@ config BUSYBOX_RESET config BUSYBOX_RESIZE bool "resize" - default y + default n help This program is used to (re)set the width and height of your current terminal. @@ -138,7 +136,7 @@ config BUSYBOX_DEFAULT_SETFONT_DIR config BUSYBOX_SETKEYCODES bool "setkeycodes" - default y + default n select BUSYBOX_PLATFORM_LINUX help This program loads entries into the kernel's scancode-to-keycode @@ -146,14 +144,14 @@ config BUSYBOX_SETKEYCODES config BUSYBOX_SETLOGCONS bool "setlogcons" - default y + default n select BUSYBOX_PLATFORM_LINUX help This program redirects the output console of kernel messages. config BUSYBOX_SHOWKEY bool "showkey" - default y + default n select BUSYBOX_PLATFORM_LINUX help Shows keys pressed. -- cgit v1.2.3 From 968be27a93e24f7b2c267b654e3f80c678d42a4a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 Jan 2015 06:04:21 +0100 Subject: fix runtime dependency --- package/xf86-video-intel/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile index 2035cae2c..92358c4f1 100644 --- a/package/xf86-video-intel/Makefile +++ b/package/xf86-video-intel/Makefile @@ -9,20 +9,20 @@ PKG_RELEASE:= 1 PKG_HASH:= 1888f2733f8dccf4ab24bc56ba62eeac41c231b98365027438702d6c55216576 PKG_DESCR:= x11 driver for intel vga chips PKG_SECTION:= x11/drivers -PKG_DEPENDS:= xorg-server libdrm mesalib libstdcxx -PKG_BUILDDEP:= xorg-server libdrm xf86driproto mesalib -PKG_SITES:= ${MASTER_SITE_XORG} +PKG_DEPENDS:= xorg-server libdrm mesalib libstdcxx libudev +PKG_BUILDDEP:= xorg-server libdrm xf86driproto mesalib eudev +PKG_SITES:= $(MASTER_SITE_XORG) PKG_SYSTEM_DEPENDS:= ibm-x40 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call PKG_template,XF86_VIDEO_INTEL,xf86-video-intel,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,XF86_VIDEO_INTEL,xf86-video-intel,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) xf86-video-intel-install: - ${INSTALL_DIR} ${IDIR_XF86_VIDEO_INTEL}/usr/lib/xorg/modules/drivers - ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/*.so \ - ${IDIR_XF86_VIDEO_INTEL}/usr/lib/xorg/modules/drivers/ + $(INSTALL_DIR) $(IDIR_XF86_VIDEO_INTEL)/usr/lib/xorg/modules/drivers + $(CP) $(WRKINST)/usr/lib/xorg/modules/drivers/*.so \ + $(IDIR_XF86_VIDEO_INTEL)/usr/lib/xorg/modules/drivers/ -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk -- cgit v1.2.3 From 27a65fefdbebf3f0b3a5e860126de7edc82b2e18 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 Jan 2015 06:04:34 +0100 Subject: update xorg-server to latest stable version --- package/fontsproto/Makefile | 12 ++++++------ package/xf86-input-keyboard/Makefile | 15 +++++++-------- package/xf86-input-mouse/Makefile | 19 +++++++++---------- package/xorg-server/Makefile | 13 ++++++------- .../xorg-server/patches/patch-hw_kdrive_linux_linux_c | 13 ------------- .../patch-hw_xfree86_os-support_linux_lnx_init_c | 13 ------------- package/xproto/Makefile | 16 ++++++++-------- 7 files changed, 36 insertions(+), 65 deletions(-) delete mode 100644 package/xorg-server/patches/patch-hw_kdrive_linux_linux_c delete mode 100644 package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c diff --git a/package/fontsproto/Makefile b/package/fontsproto/Makefile index f21021f4c..76ee6c4af 100644 --- a/package/fontsproto/Makefile +++ b/package/fontsproto/Makefile @@ -4,18 +4,18 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= fontsproto -PKG_VERSION:= 2.1.2 +PKG_VERSION:= 2.1.3 PKG_RELEASE:= 1 -PKG_HASH:= aaf2375a617afdc1500069a838c0694f59f19d592fc9d9ffa05bd4f37b8504c1 +PKG_HASH:= 72c44e63044b2b66f6fa112921621ecc20c71193982de4f198d9a29cda385c5e PKG_DESCR:= fonts extension headers PKG_SECTION:= dev/header -PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= $(MASTER_SITE_XORG) PKG_OPTS:= dev devonly -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call PKG_template,FONTSPROTO,fontsproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,FONTSPROTO,fontsproto,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile index d1952f056..4d1e542f1 100644 --- a/package/xf86-input-keyboard/Makefile +++ b/package/xf86-input-keyboard/Makefile @@ -11,20 +11,19 @@ PKG_DESCR:= x11 driver for keyboard PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server libstdcxx PKG_BUILDDEP:= xorg-server -PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= $(MASTER_SITE_XORG) -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_ARCH_DEPENDS:= !m68k PKG_CFLINE_XF86_INPUT_KEYBOARD:= depends on ADK_TARGET_WITH_INPUT || ADK_TARGET_QEMU_WITH_GRAPHIC include $(ADK_TOPDIR)/mk/package.mk -$(eval $(