Index: head/sysutils/Makefile =================================================================== --- head/sysutils/Makefile (revision 391475) +++ head/sysutils/Makefile (revision 391476) @@ -1,1135 +1,1138 @@ # $FreeBSD$ # COMMENT = System utilities SUBDIR += 3dm SUBDIR += 44bsd-more SUBDIR += 915resolution SUBDIR += DTraceToolkit SUBDIR += LPRng SUBDIR += LPRngTool SUBDIR += abck SUBDIR += abgx360 SUBDIR += abgx360gui SUBDIR += accountsservice SUBDIR += acpi_call SUBDIR += acpica-tools SUBDIR += acts SUBDIR += adtool SUBDIR += afbinit SUBDIR += afflib SUBDIR += afio SUBDIR += agedu SUBDIR += ah-tty SUBDIR += aimage SUBDIR += aird SUBDIR += am-utils SUBDIR += amrstat SUBDIR += anacron SUBDIR += and SUBDIR += ansible SUBDIR += apachetop SUBDIR += apcpwr SUBDIR += apcupsd SUBDIR += apt SUBDIR += arcconf SUBDIR += archivemount SUBDIR += areca-cli SUBDIR += ascpu SUBDIR += asfsm SUBDIR += asmem SUBDIR += asmon SUBDIR += asusoled SUBDIR += ataidle SUBDIR += atitvout SUBDIR += atop SUBDIR += auto-admin SUBDIR += autojump SUBDIR += automount SUBDIR += automounter SUBDIR += autopsy SUBDIR += avfs SUBDIR += azure-agent SUBDIR += b2sum SUBDIR += b43-fwcutter SUBDIR += backupchecker SUBDIR += backuppc SUBDIR += backuppc-devel SUBDIR += bacula-bat SUBDIR += bacula-client SUBDIR += bacula-client-static SUBDIR += bacula-docs SUBDIR += bacula-server SUBDIR += bacula5-bat SUBDIR += bacula5-client SUBDIR += bacula5-client-static SUBDIR += bacula5-docs SUBDIR += bacula5-server SUBDIR += baloo SUBDIR += baloo-widgets SUBDIR += bamf SUBDIR += bashburn SUBDIR += batmon SUBDIR += battfink SUBDIR += battmond SUBDIR += battray SUBDIR += bbapm SUBDIR += bbcp SUBDIR += bchunk SUBDIR += beadm SUBDIR += beadm-devel SUBDIR += bhyve-rc SUBDIR += biosfont SUBDIR += bkpupsd SUBDIR += bksh SUBDIR += bontmia SUBDIR += boxbackup SUBDIR += boxbackup-devel SUBDIR += brasero SUBDIR += bsd-splash-changer SUBDIR += bsdadminscripts SUBDIR += bsdconfig SUBDIR += bsdcrashtar SUBDIR += bsdhwmon SUBDIR += bsdinfo SUBDIR += bsdmoted SUBDIR += bsdploy SUBDIR += bsdstats SUBDIR += btsixad SUBDIR += bulk_extractor SUBDIR += busybox SUBDIR += busybox-unstable SUBDIR += byobu SUBDIR += cbsd SUBDIR += ccd2iso SUBDIR += cciss_vol_status SUBDIR += ccze SUBDIR += cdargs SUBDIR += cdbkup SUBDIR += cdeploy SUBDIR += cdf SUBDIR += cdircmp SUBDIR += cdls SUBDIR += cdrdao SUBDIR += cdrkit SUBDIR += cdroot SUBDIR += cdrtools SUBDIR += cdrtools-devel SUBDIR += cfengine SUBDIR += cfengine22 SUBDIR += cfengine32 SUBDIR += cfengine33 SUBDIR += cfengine34 SUBDIR += cfengine35 SUBDIR += cfengine36 SUBDIR += chgrep SUBDIR += cinnamon-control-center SUBDIR += cinnamon-settings-daemon SUBDIR += ciso SUBDIR += ciso-maker SUBDIR += ck4up SUBDIR += clean SUBDIR += clockspeed SUBDIR += clone SUBDIR += clonehdd SUBDIR += cloop-utils SUBDIR += clsync SUBDIR += cmdwatch SUBDIR += cmockery2 SUBDIR += cmogstored SUBDIR += cmospwd SUBDIR += cog SUBDIR += colorize SUBDIR += condor SUBDIR += confctl SUBDIR += confman SUBDIR += conky SUBDIR += conky-awesome SUBDIR += consolehm SUBDIR += consolekit SUBDIR += consul SUBDIR += contractor SUBDIR += copytape SUBDIR += coreutils SUBDIR += cotty SUBDIR += cpdup SUBDIR += cpu SUBDIR += cpuburn SUBDIR += cpuid SUBDIR += cpulimit SUBDIR += cramfs SUBDIR += crashme SUBDIR += createrepo SUBDIR += cronolog SUBDIR += cronolog-devel SUBDIR += curly SUBDIR += currtime SUBDIR += cw SUBDIR += daa2iso SUBDIR += dae SUBDIR += daedalus SUBDIR += daemontools SUBDIR += daemontools-encore SUBDIR += dar SUBDIR += dateutils SUBDIR += dc3dd SUBDIR += dcfldd SUBDIR += dd_rescue SUBDIR += ddpt SUBDIR += ddrescue SUBDIR += debhelper SUBDIR += debootstrap SUBDIR += deltarpm SUBDIR += deltup SUBDIR += desktop-installer SUBDIR += detach SUBDIR += detox SUBDIR += devcpu-data SUBDIR += devstat SUBDIR += dfc SUBDIR += di SUBDIR += dim SUBDIR += dirdiff SUBDIR += direnv SUBDIR += dirvish SUBDIR += diskcheckd SUBDIR += diskimage-tools SUBDIR += diskscrub SUBDIR += disktool SUBDIR += disktype SUBDIR += djmount SUBDIR += dmg2img SUBDIR += dmidecode SUBDIR += docker SUBDIR += doinkd SUBDIR += dolly SUBDIR += downtime SUBDIR += downtimed SUBDIR += dt SUBDIR += dtpstree SUBDIR += du2ps SUBDIR += duff SUBDIR += dunst SUBDIR += duplicity SUBDIR += duply SUBDIR += dupmerge SUBDIR += dvd+rw-tools SUBDIR += dvdbackup SUBDIR += dvdimagecmp SUBDIR += dvdisaster SUBDIR += dvdvideo SUBDIR += dvtm SUBDIR += dwatch SUBDIR += e2fsprogs SUBDIR += ec2-scripts SUBDIR += edid-decode SUBDIR += eject SUBDIR += endian SUBDIR += enteruser SUBDIR += entr SUBDIR += env4801 SUBDIR += etcmerge SUBDIR += etcupdate SUBDIR += eventlog SUBDIR += evtviewer SUBDIR += exfat-utils SUBDIR += extipl SUBDIR += ezjail SUBDIR += f3 SUBDIR += fanout SUBDIR += farbot SUBDIR += fastest_cvsup SUBDIR += fatback SUBDIR += fconfig SUBDIR += fcron SUBDIR += fdupes SUBDIR += feather SUBDIR += fetchlog SUBDIR += ffs2recov SUBDIR += file SUBDIR += filedupe SUBDIR += filelight-kde4 SUBDIR += fileprune SUBDIR += fileschanged SUBDIR += filetype SUBDIR += filewatcherd SUBDIR += finfo SUBDIR += firstboot-freebsd-update SUBDIR += firstboot-growfs SUBDIR += firstboot-pkgs SUBDIR += flasher SUBDIR += flashrom SUBDIR += flexbackup SUBDIR += flock SUBDIR += flog SUBDIR += flyback SUBDIR += fonteditfs SUBDIR += foremost SUBDIR += fortunelock SUBDIR += fpart SUBDIR += fpc-syslog SUBDIR += fpc-users SUBDIR += fpc-utmp SUBDIR += fpc-uuid SUBDIR += fpkg SUBDIR += freebsd-snapshot SUBDIR += freecolor SUBDIR += freedt SUBDIR += freeipmi SUBDIR += freesbie SUBDIR += froxlor SUBDIR += fsbackup SUBDIR += fsc SUBDIR += fstyp SUBDIR += ftwin SUBDIR += fusefs-afuse SUBDIR += fusefs-chironfs SUBDIR += fusefs-cryptofs SUBDIR += fusefs-curlftpfs SUBDIR += fusefs-encfs SUBDIR += fusefs-exfat SUBDIR += fusefs-ext4fuse SUBDIR += fusefs-funionfs SUBDIR += fusefs-fusepak SUBDIR += fusefs-fusexmp_fh SUBDIR += fusefs-gnome-vfs SUBDIR += fusefs-gstfs SUBDIR += fusefs-gunzip SUBDIR += fusefs-httpfs SUBDIR += fusefs-ifuse SUBDIR += fusefs-kmod SUBDIR += fusefs-libs SUBDIR += fusefs-mhddfs SUBDIR += fusefs-mp3fs SUBDIR += fusefs-ntfs SUBDIR += fusefs-pod SUBDIR += fusefs-rar2fs SUBDIR += fusefs-s3fs SUBDIR += fusefs-simple-mtpfs SUBDIR += fusefs-smbnetfs SUBDIR += fusefs-sqlfs SUBDIR += fusefs-sshfs SUBDIR += fusefs-unionfs SUBDIR += fusefs-wikipediafs SUBDIR += fusefs-zip SUBDIR += fvcool SUBDIR += gaffitter SUBDIR += gai-leds SUBDIR += ganglia-monitor-core SUBDIR += ganglia-webfrontend SUBDIR += gapcmon SUBDIR += garcon SUBDIR += gather SUBDIR += gcdmaster SUBDIR += gcombust SUBDIR += gconf-editor SUBDIR += gdisk SUBDIR += gdmap SUBDIR += geomWatch SUBDIR += geomgui SUBDIR += getdelta SUBDIR += geteltorito SUBDIR += gigolo SUBDIR += gkfreq SUBDIR += gkleds2 SUBDIR += gkrellfire SUBDIR += gkrellflynn SUBDIR += gkrellm-trayicons SUBDIR += gkrellm2 SUBDIR += gkrelltop SUBDIR += gksu SUBDIR += gnome-control-center SUBDIR += gnome-device-manager SUBDIR += gnome-mount SUBDIR += gnome-pkgview SUBDIR += gnome-power-manager SUBDIR += gnome-schedule SUBDIR += gnome-settings-daemon SUBDIR += gnome-system-monitor SUBDIR += gnome_subr SUBDIR += goaccess SUBDIR += gosa SUBDIR += gpart SUBDIR += gpte SUBDIR += graffer SUBDIR += graid5 SUBDIR += graveman SUBDIR += grok SUBDIR += grub2 SUBDIR += grub2-bhyve SUBDIR += grub2-efi SUBDIR += grub2-pcbsd SUBDIR += gsmartcontrol SUBDIR += gstopd SUBDIR += gstreamer-plugins-cdio SUBDIR += gstreamer-plugins-hal SUBDIR += gstreamer1-plugins-cdio SUBDIR += gtk-imonc SUBDIR += hachoir-metadata SUBDIR += hachoir-subfile SUBDIR += hachoir-urwid SUBDIR += hachoir-wx SUBDIR += hal SUBDIR += hal-info SUBDIR += hardlink SUBDIR += hatop SUBDIR += hdrecover SUBDIR += healthd SUBDIR += heartbeat SUBDIR += heirloom SUBDIR += hextools SUBDIR += hfsexplorer SUBDIR += hfsutils SUBDIR += hidesvn SUBDIR += highlnk SUBDIR += hilite SUBDIR += host-setup SUBDIR += hourglass SUBDIR += hoz SUBDIR += hpacucli SUBDIR += hploscripts SUBDIR += hptcli SUBDIR += hs-angel SUBDIR += hs-cpu SUBDIR += hs-ekg SUBDIR += hs-ekg-core SUBDIR += htop SUBDIR += httplog SUBDIR += hwstat SUBDIR += i2c-tools SUBDIR += i7z SUBDIR += iat SUBDIR += installwatch SUBDIR += intel-pcm SUBDIR += iocage SUBDIR += iogen SUBDIR += iograph SUBDIR += ioping SUBDIR += ipa SUBDIR += ipad_charge SUBDIR += ipmitool SUBDIR += ipsc SUBDIR += isc-cron SUBDIR += isomaster SUBDIR += isomd5sum SUBDIR += istatd SUBDIR += jadm SUBDIR += jail-primer SUBDIR += jail2 SUBDIR += jailctl SUBDIR += jaildaemon SUBDIR += jailme SUBDIR += jailrc SUBDIR += javaservicewrapper SUBDIR += jdiskreport SUBDIR += jfbterm SUBDIR += jkill SUBDIR += jps SUBDIR += jtop SUBDIR += jtopen SUBDIR += jvmtop SUBDIR += jx SUBDIR += k3b-kde4 SUBDIR += k8temp SUBDIR += kcm-polkit-kde SUBDIR += kcron SUBDIR += kdeadmin4 SUBDIR += kdf SUBDIR += kdirstat SUBDIR += keyboard-daemon SUBDIR += kfilemetadata SUBDIR += kfloppy SUBDIR += kiconvtool SUBDIR += kldfind SUBDIR += kldpatch SUBDIR += knutclient-kde4 SUBDIR += krename-kde4 SUBDIR += kshutdown-kde4 SUBDIR += ksysguardd SUBDIR += ksystemlog SUBDIR += kuser SUBDIR += lbl-cf SUBDIR += lbl-hf SUBDIR += lcdproc SUBDIR += ldap-account-manager SUBDIR += ldapenter SUBDIR += ldapvi SUBDIR += ledit SUBDIR += less SUBDIR += lfm SUBDIR += libcdio SUBDIR += libcdio-paranoia SUBDIR += libchk SUBDIR += libfvde SUBDIR += libgksu SUBDIR += libieee1284 SUBDIR += libretto-config SUBDIR += libsunacl SUBDIR += liburcu SUBDIR += libutempter SUBDIR += libzeitgeist SUBDIR += life-preserver SUBDIR += lineak-defaultplugin SUBDIR += lineak-xosdplugin SUBDIR += lineakd SUBDIR += linrename SUBDIR += linux-crashplan SUBDIR += linux-f10-procps SUBDIR += linux-nero SUBDIR += linuxfdisk SUBDIR += livecd SUBDIR += lmmon SUBDIR += lmon SUBDIR += lnav SUBDIR += log_analysis SUBDIR += loganalyzer SUBDIR += logrotate SUBDIR += logstalgia SUBDIR += logstash SUBDIR += logstash-contrib SUBDIR += logstash-forwarder SUBDIR += logtool SUBDIR += logwatch SUBDIR += lookat SUBDIR += lsof SUBDIR += ltrace SUBDIR += luckybackup SUBDIR += lxinput SUBDIR += lxsplit SUBDIR += lxtask SUBDIR += lxterminal SUBDIR += magicrescue SUBDIR += manck SUBDIR += mapchan SUBDIR += massadmin SUBDIR += mate-control-center SUBDIR += mate-polkit SUBDIR += mate-power-manager SUBDIR += mate-settings-daemon SUBDIR += mate-system-monitor SUBDIR += mbgtools SUBDIR += mcelog SUBDIR += mcollective SUBDIR += mcollective-nrpe-agent SUBDIR += mcollective-puppet-agent SUBDIR += mcollective-shell-agent SUBDIR += mcollective-shell-client SUBDIR += mcron SUBDIR += mcweject SUBDIR += mdcp SUBDIR += mdf2iso SUBDIR += megacli SUBDIR += megarc SUBDIR += memdump SUBDIR += memfetch SUBDIR += memtest SUBDIR += memtest86 SUBDIR += memtest86+ SUBDIR += metalog SUBDIR += mfid SUBDIR += mgeupsd SUBDIR += minimunin SUBDIR += minirsyslogd SUBDIR += mixer SUBDIR += mkfile SUBDIR += mkfwimage SUBDIR += mkntpwd SUBDIR += mksunbootcd SUBDIR += mnrpes SUBDIR += modules SUBDIR += monit SUBDIR += monitord SUBDIR += monitorix SUBDIR += mono-kmod SUBDIR += moosefs-chunkserver SUBDIR += moosefs-client SUBDIR += moosefs-master SUBDIR += moreutils SUBDIR += most SUBDIR += mount.app SUBDIR += mountsmb2 SUBDIR += mpiexec SUBDIR += mptd SUBDIR += msktutil SUBDIR += msyslog SUBDIR += mtpfs SUBDIR += mtxorbd SUBDIR += multitail SUBDIR += munin-common SUBDIR += munin-master SUBDIR += munin-node SUBDIR += muse SUBDIR += mybashburn SUBDIR += n98-magerun SUBDIR += nagios-statd SUBDIR += namefix SUBDIR += nbosd SUBDIR += ncdu SUBDIR += nepomuk-core SUBDIR += nepomuk-widgets SUBDIR += nfsping SUBDIR += nitrogen SUBDIR += no-login SUBDIR += npadmin SUBDIR += nrg2iso SUBDIR += ntfsprogs SUBDIR += nut SUBDIR += nvclock SUBDIR += nvramtool SUBDIR += oak SUBDIR += obliterate SUBDIR += odo SUBDIR += ods2 SUBDIR += open SUBDIR += openipmi SUBDIR += openupsd SUBDIR += ori SUBDIR += osquery SUBDIR += p5-BSD-Jail-Object SUBDIR += p5-BSD-Process SUBDIR += p5-BSD-Sysctl SUBDIR += p5-BackupPC-XS SUBDIR += p5-Brackup SUBDIR += p5-Dir-Purge SUBDIR += p5-File-DirCompare SUBDIR += p5-File-Listing SUBDIR += p5-File-Log SUBDIR += p5-File-Next SUBDIR += p5-File-Signature SUBDIR += p5-File-Stat-Bits SUBDIR += p5-File-Stat-ModeString SUBDIR += p5-File-Tee SUBDIR += p5-File-Which SUBDIR += p5-Filesys-Df SUBDIR += p5-Filesys-DfPortable SUBDIR += p5-Filesys-DiskFree SUBDIR += p5-Filesys-DiskSpace SUBDIR += p5-Filesys-DiskUsage SUBDIR += p5-Filesys-Statvfs SUBDIR += p5-Fuse SUBDIR += p5-Fuse-Simple SUBDIR += p5-Iterator-File SUBDIR += p5-Lchown SUBDIR += p5-Linux-Cpuinfo SUBDIR += p5-MogileFS-Client SUBDIR += p5-MogileFS-Network SUBDIR += p5-MogileFS-Server SUBDIR += p5-MogileFS-Utils SUBDIR += p5-Monitor-Simple SUBDIR += p5-Plugtools SUBDIR += p5-Plugtools-Plugins-HomeOU SUBDIR += p5-Probe-Perl SUBDIR += p5-Proc-PidUtil SUBDIR += p5-Proclet SUBDIR += p5-Quota SUBDIR += p5-Rex SUBDIR += p5-Samba-SIDhelper SUBDIR += p5-Schedule-At SUBDIR += p5-Schedule-Cron SUBDIR += p5-Schedule-Load SUBDIR += p5-Schedule-Match SUBDIR += p5-Shell-Command SUBDIR += p5-Stat-lsMode SUBDIR += p5-Sys-CpuLoad SUBDIR += p5-Sys-Filesystem SUBDIR += p5-Sys-Gamin SUBDIR += p5-Sys-Group-GIDhelper SUBDIR += p5-Sys-HostIP SUBDIR += p5-Sys-Hostname-FQDN SUBDIR += p5-Sys-Hostname-Long SUBDIR += p5-Sys-Load SUBDIR += p5-Sys-Syslog SUBDIR += p5-Sys-User-UIDhelper SUBDIR += p5-Sysadm-Install SUBDIR += p5-SyslogScan SUBDIR += p5-Tail-Stat SUBDIR += p5-Tie-Syslog SUBDIR += p5-Ubic SUBDIR += p5-Unix-ConfigFile SUBDIR += p5-Unix-Lsof SUBDIR += p5-Unix-Mknod SUBDIR += p5-Unix-Processors SUBDIR += p5-Unix-Syslog SUBDIR += p5-User SUBDIR += p5-ZConf-Cron SUBDIR += p5-arclog SUBDIR += p5-reslog SUBDIR += packer SUBDIR += pacman SUBDIR += paicc SUBDIR += pam_mount SUBDIR += panicmail SUBDIR += parallel SUBDIR += password-store SUBDIR += patchelf SUBDIR += pax-utils SUBDIR += pbi-manager SUBDIR += pbimaker SUBDIR += pcbsd-appweb SUBDIR += pcbsd-libsh SUBDIR += pcbsd-syscache SUBDIR += pcbsd-utils SUBDIR += pcbsd-utils-qt5 SUBDIR += pcfclock SUBDIR += pciutils SUBDIR += pcpustat SUBDIR += pdixtract SUBDIR += pdsh SUBDIR += pdumpfs SUBDIR += pear-Cache SUBDIR += pear-Cache_Lite SUBDIR += pear-File SUBDIR += pear-File_Find SUBDIR += pear-File_Fstab SUBDIR += pear-File_Gettext SUBDIR += pear-Horde_Log SUBDIR += pear-Horde_Vfs SUBDIR += pear-I18Nv2 SUBDIR += pear-Log SUBDIR += pear-Translation2 SUBDIR += pecl-mogilefs SUBDIR += pecl-proctitle SUBDIR += pefs-kmod SUBDIR += personality SUBDIR += pesign SUBDIR += pflogx SUBDIR += pfstat SUBDIR += pftables SUBDIR += pftop SUBDIR += phantom SUBDIR += php5-fileinfo SUBDIR += php5-posix SUBDIR += php55-fileinfo SUBDIR += php55-posix SUBDIR += php56-fileinfo SUBDIR += php56-posix SUBDIR += pick SUBDIR += pidof SUBDIR += pipemeter SUBDIR += plasma-applet-apcups SUBDIR += plconfig SUBDIR += pmt SUBDIR += policykit SUBDIR += policykit-gnome SUBDIR += policykit-qt SUBDIR += polkit SUBDIR += polkit-gnome SUBDIR += polkit-kde SUBDIR += polkit-qt SUBDIR += polkit-qt5 SUBDIR += powerman SUBDIR += pp SUBDIR += pprotectd SUBDIR += prelink SUBDIR += prips SUBDIR += procenv SUBDIR += procmap SUBDIR += progsreiserfs SUBDIR += pslist SUBDIR += psmisc SUBDIR += pstack SUBDIR += pstacku SUBDIR += pstree SUBDIR += ptools SUBDIR += puppet37 SUBDIR += puppet SUBDIR += puppet-lint SUBDIR += puppet-mode.el SUBDIR += pv SUBDIR += pwd_unmkdb SUBDIR += pwgen SUBDIR += pwsafe SUBDIR += py-XenAPI SUBDIR += py-analyzemft SUBDIR += py-bcfg2 SUBDIR += py-croniter SUBDIR += py-crontab SUBDIR += py-danzfs SUBDIR += py-drmaa SUBDIR += py-execnet SUBDIR += py-ezjailremote SUBDIR += py-filelike SUBDIR += py-glances SUBDIR += py-halite SUBDIR += py-iowait SUBDIR += py-nagiosplugin SUBDIR += py-ploy SUBDIR += py-ploy_ansible SUBDIR += py-ploy_ec2 SUBDIR += py-ploy_ezjail SUBDIR += py-ploy_fabric SUBDIR += py-plumbum SUBDIR += py-power SUBDIR += py-psutil SUBDIR += py-psutil121 SUBDIR += py-ptyprocess SUBDIR += py-pytsk SUBDIR += py-queuelib SUBDIR += py-ranger SUBDIR += py-salt SUBDIR += py-shutilwhich SUBDIR += py-stdiff SUBDIR += py-supervisor SUBDIR += py-tmuxp SUBDIR += py-zdaemon SUBDIR += py-zfs SUBDIR += pydf SUBDIR += qchroot SUBDIR += qjail SUBDIR += qjail2 SUBDIR += qlogtools SUBDIR += qpxtool SUBDIR += qsynergy SUBDIR += qt5-qtpaths SUBDIR += quicksynergy SUBDIR += qzeitgeist SUBDIR += racktables SUBDIR += radeontool SUBDIR += radmind SUBDIR += raincoat SUBDIR += rcadm SUBDIR += rclean SUBDIR += rcm SUBDIR += rdate SUBDIR += rdiff-backup SUBDIR += rdiff-backup-devel SUBDIR += rdup SUBDIR += realsync SUBDIR += recoverdm SUBDIR += reed SUBDIR += rej SUBDIR += relaxconf SUBDIR += rename SUBDIR += renameutils SUBDIR += reoback SUBDIR += respond SUBDIR += retail SUBDIR += rfstool SUBDIR += rhc SUBDIR += rinse SUBDIR += rmonitor SUBDIR += roottail SUBDIR += rsnapshot SUBDIR += rsyncbackup SUBDIR += rsyncmanager SUBDIR += rsyncrypto SUBDIR += rsyslog7 SUBDIR += rsyslog8 SUBDIR += rtty SUBDIR += ruby-quota SUBDIR += rubygem-SyslogLogger SUBDIR += rubygem-backup SUBDIR += rubygem-bosh-gen SUBDIR += rubygem-bosh_cli SUBDIR += rubygem-bundler SUBDIR += rubygem-bundler17 SUBDIR += rubygem-bundler_ext SUBDIR += rubygem-capistrano SUBDIR += rubygem-capistrano-ext SUBDIR += rubygem-chef SUBDIR += rubygem-chef-api SUBDIR += rubygem-chef-zero SUBDIR += rubygem-facter SUBDIR += rubygem-fluent-mixin-plaintextformatter SUBDIR += rubygem-fluent-plugin-config-expander SUBDIR += rubygem-fluent-plugin-file-alternative SUBDIR += rubygem-fluent-plugin-tail-asis SUBDIR += rubygem-fluentd SUBDIR += rubygem-fssm SUBDIR += rubygem-god SUBDIR += rubygem-guard SUBDIR += rubygem-guard-compat SUBDIR += rubygem-guard-livereload SUBDIR += rubygem-guard-minitest SUBDIR += rubygem-guard-rspec SUBDIR += rubygem-hammer_cli SUBDIR += rubygem-hammer_cli_foreman SUBDIR += rubygem-hammer_cli_foreman_bootdisk SUBDIR += rubygem-hammer_cli_foreman_salt SUBDIR += rubygem-hammer_cli_foreman_ssh SUBDIR += rubygem-hiera SUBDIR += rubygem-hiera-file SUBDIR += rubygem-librarian-puppet SUBDIR += rubygem-log4r SUBDIR += rubygem-logify SUBDIR += rubygem-mogilefs-client SUBDIR += rubygem-mothra SUBDIR += rubygem-murder SUBDIR += rubygem-ohai SUBDIR += rubygem-parallel SUBDIR += rubygem-puppet_forge SUBDIR += rubygem-r10k SUBDIR += rubygem-rubyipmi SUBDIR += rubygem-shellany SUBDIR += rubygem-smart_proxy_chef SUBDIR += rubygem-smart_proxy_salt SUBDIR += rubygem-sys-admin SUBDIR += rubygem-sys-cpu SUBDIR += rubygem-sys-filesystem SUBDIR += rubygem-sys-host SUBDIR += rubygem-sys-proctable SUBDIR += rubygem-sys-uname SUBDIR += rubygem-sys-uptime SUBDIR += rubygem-teamocil SUBDIR += rubygem-winrm SUBDIR += rubygem-yell SUBDIR += rundeck SUBDIR += runit SUBDIR += runwhen SUBDIR += s6 SUBDIR += safe-rm SUBDIR += safecat SUBDIR += samefile SUBDIR += samesame SUBDIR += sas2ircu SUBDIR += savelogs SUBDIR += sb16config SUBDIR += sbsigntool SUBDIR += scalpel SUBDIR += scan_ffs SUBDIR += scanbuttond SUBDIR += scanmem SUBDIR += schedutils SUBDIR += scprotect SUBDIR += screen SUBDIR += screen-legacy SUBDIR += screenfetch SUBDIR += screenie SUBDIR += scterc SUBDIR += sd-agent SUBDIR += sdd SUBDIR += sdparm SUBDIR += searchmonkey SUBDIR += seatools SUBDIR += sec SUBDIR += serf SUBDIR += setcdboot SUBDIR += setquota SUBDIR += sformat SUBDIR += sg3_utils SUBDIR += shim SUBDIR += shlock SUBDIR += shmcat SUBDIR += sievelog SUBDIR += skill SUBDIR += slack SUBDIR += sleuthkit SUBDIR += sloth SUBDIR += slst SUBDIR += slurm-hpc SUBDIR += smartmontools SUBDIR += smp_utils SUBDIR += snap SUBDIR += snowlog SUBDIR += socket SUBDIR += socklog SUBDIR += sortu SUBDIR += spindown SUBDIR += spinner SUBDIR += spiped SUBDIR += squashfs-tools SUBDIR += sshsudo SUBDIR += ssid SUBDIR += ssync SUBDIR += stalepid SUBDIR += stmpclean SUBDIR += stow SUBDIR += stowES SUBDIR += stress SUBDIR += su2 SUBDIR += superiotool SUBDIR += swapd SUBDIR += swapexd SUBDIR += swapmon SUBDIR += sweeper SUBDIR += symlinks SUBDIR += symon SUBDIR += synergy SUBDIR += sysgather SUBDIR += sysinfo SUBDIR += syslinux SUBDIR += syslog-ng SUBDIR += syslog-ng-devel SUBDIR += syslog-ng-incubator SUBDIR += syslog-ng-incubator03 SUBDIR += syslog-ng33 SUBDIR += syslog-ng34 SUBDIR += syslog-ng35 SUBDIR += syslogger SUBDIR += sysrc SUBDIR += system-tools-backends SUBDIR += sysvbanner SUBDIR += tai64nfrac SUBDIR += tarsnap SUBDIR += tartarus SUBDIR += tbku SUBDIR += tclsyslog SUBDIR += tcplist SUBDIR += tdir SUBDIR += tenshi SUBDIR += tentakel SUBDIR += terraform SUBDIR += testdisk SUBDIR += thefish SUBDIR += timelimit SUBDIR += timemon SUBDIR += titlefix SUBDIR += tkdvd SUBDIR += tlsdate SUBDIR += tm SUBDIR += tmpreaper SUBDIR += tmpwatch SUBDIR += tmux SUBDIR += topless SUBDIR += torque SUBDIR += torsmo SUBDIR += toshctl SUBDIR += tracker SUBDIR += tree SUBDIR += tren SUBDIR += ts SUBDIR += tss SUBDIR += tty-clock SUBDIR += ttyload SUBDIR += tw_cli SUBDIR += tzdialog + SUBDIR += u-boot-bananapi SUBDIR += u-boot-beaglebone + SUBDIR += u-boot-cubieboard + SUBDIR += u-boot-cubieboard2 SUBDIR += u-boot-cubox-hummingboard SUBDIR += u-boot-duovero SUBDIR += u-boot-pandaboard SUBDIR += u-boot-rpi SUBDIR += u-boot-rpi2 SUBDIR += u-boot-wandboard SUBDIR += ua SUBDIR += ucspi-ipc SUBDIR += ucspi-proxy SUBDIR += ucspi-ssl SUBDIR += ucspi-ssl-tls SUBDIR += ucspi-tcp SUBDIR += ucspi-unix SUBDIR += udfclient SUBDIR += ufs_copy SUBDIR += uhidd SUBDIR += uif2iso SUBDIR += unieject SUBDIR += uniutils SUBDIR += unquote SUBDIR += unstow SUBDIR += upower SUBDIR += upsdaemon SUBDIR += uptimed SUBDIR += usb_modeswitch SUBDIR += usbhotkey SUBDIR += usbutils SUBDIR += uschedule SUBDIR += userinfo SUBDIR += userlist SUBDIR += usermatic SUBDIR += usermin SUBDIR += userneu SUBDIR += userneu-devel SUBDIR += usrinfo SUBDIR += utcount SUBDIR += vagrant SUBDIR += vbetool SUBDIR += vcp SUBDIR += vhdtool SUBDIR += videogen SUBDIR += vii SUBDIR += vils SUBDIR += vimpager SUBDIR += virtualmin SUBDIR += vlogger SUBDIR += vmdktool SUBDIR += vmtouch SUBDIR += vobcopy SUBDIR += volman SUBDIR += vordog SUBDIR += vpnc-scripts SUBDIR += vstrip SUBDIR += vttest SUBDIR += wait_on SUBDIR += warden SUBDIR += watchdog SUBDIR += watchfolder SUBDIR += watchman SUBDIR += watchmen SUBDIR += webjob SUBDIR += webmin SUBDIR += weedit SUBDIR += wemux SUBDIR += whatpix SUBDIR += whowatch SUBDIR += wiimms SUBDIR += wmapmload SUBDIR += wmbluecpu SUBDIR += wmbsdbatt SUBDIR += wmcpuload SUBDIR += wmcube SUBDIR += wmcube-gdk SUBDIR += wmdiskmon SUBDIR += wmfire SUBDIR += wmflame SUBDIR += wmmemfree SUBDIR += wmtop SUBDIR += wmupmon SUBDIR += worldtools SUBDIR += wtail SUBDIR += wuzzah SUBDIR += x86info SUBDIR += xacpim SUBDIR += xbatt SUBDIR += xbattbar SUBDIR += xcdroast SUBDIR += xcpustate SUBDIR += xdu SUBDIR += xe-guest-utilities SUBDIR += xen-guest-tools SUBDIR += xen-tools SUBDIR += xfburn SUBDIR += xfce4-battery-plugin SUBDIR += xfce4-bsdcpufreq-plugin SUBDIR += xfce4-cpugraph-plugin SUBDIR += xfce4-diskperf-plugin SUBDIR += xfce4-fsguard-plugin SUBDIR += xfce4-genmon-plugin SUBDIR += xfce4-minicmd-plugin SUBDIR += xfce4-mount-plugin SUBDIR += xfce4-netload-plugin SUBDIR += xfce4-power-manager SUBDIR += xfce4-settings SUBDIR += xfce4-systemload-plugin SUBDIR += xfce4-wavelan-plugin SUBDIR += xfsm SUBDIR += xfsprogs SUBDIR += xin SUBDIR += xjobs SUBDIR += xlogmaster SUBDIR += xmbmon SUBDIR += xorriso SUBDIR += xosview SUBDIR += xstow SUBDIR += xsysstats SUBDIR += xvidcap SUBDIR += yum SUBDIR += zbackup SUBDIR += zeitgeist SUBDIR += zeroer SUBDIR += zetaback SUBDIR += zfs-periodic SUBDIR += zfs-replicate SUBDIR += zfs-snapshot-clean SUBDIR += zfs-snapshot-mgmt SUBDIR += zfs-stats SUBDIR += zfs-stats-lite SUBDIR += zfsnap SUBDIR += zfstools SUBDIR += zidrav SUBDIR += zisofs-tools SUBDIR += zogftw SUBDIR += zrep SUBDIR += zsd SUBDIR += zxfer .include Index: head/sysutils/u-boot-bananapi/Makefile =================================================================== --- head/sysutils/u-boot-bananapi/Makefile (nonexistent) +++ head/sysutils/u-boot-bananapi/Makefile (revision 391476) @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PKGNAMESUFFIX= -bananapi + +COMMENT= Cross-build U-Boot loader for Banana Pi + +LICENSE= GPLv2 + +# Local overrides +MASTERDIR= ${.CURDIR}/../u-boot-cubieboard +DESCR= ${.CURDIR}/pkg-descr +MODEL= bananapi +CONF_TARGET= Bananapi_defconfig + +.include "${MASTERDIR}/Makefile" Property changes on: head/sysutils/u-boot-bananapi/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/u-boot-bananapi/pkg-descr =================================================================== --- head/sysutils/u-boot-bananapi/pkg-descr (nonexistent) +++ head/sysutils/u-boot-bananapi/pkg-descr (revision 391476) @@ -0,0 +1,19 @@ +U-Boot loader for Banana Pi. + +To install this bootloader, follow the instructions in + http://linux-sunxi.org/Bootable_SD_card#Bootloader + +This version is patched so that: + * ELF and API features are enabled. + * The default environment is trimmed to just what's needed to boot. + * The saveenv command writes to the file u-boot.env on the FAT partition. + * The DTB file name is chosen based on the board model and passed to ubldr + using the fdtfile env variable. ubldr loads the DTB from /boot/dtb/ on + the FreeBSD partition. + * By default, it loads ELF ubldr from file ubldr on the FAT partition + to address 0x42000000, and launches it. + +For information about running FreeBSD on Banana Pi, see + https://wiki.freebsd.org/FreeBSD/arm/Allwinner + +For general information about U-Boot see WWW: http://www.denx.de/wiki/U-Boot Property changes on: head/sysutils/u-boot-bananapi/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/u-boot-cubieboard/Makefile =================================================================== --- head/sysutils/u-boot-cubieboard/Makefile (nonexistent) +++ head/sysutils/u-boot-cubieboard/Makefile (revision 391476) @@ -0,0 +1,48 @@ +# $FreeBSD$ + +PORTNAME= u-boot +PORTVERSION= 2015.04 +CATEGORIES= sysutils +MASTER_SITES= ftp://ftp.denx.de/pub/u-boot/ +PKGNAMESUFFIX?= -cubieboard + +MAINTAINER= loos@FreeBSD.org +COMMENT?= Cross-build U-Boot loader for Cubieboard + +LICENSE= GPLv2 + +BUILD_DEPENDS= arm-none-eabi-gcc:${PORTSDIR}/devel/arm-none-eabi-gcc + +MODEL?= cubieboard +CONF_TARGET?= Cubieboard_defconfig + +NO_ARCH= yes + +WRKSRC= ${WRKDIR}/u-boot-${DISTVERSION} +USES= gmake tar:bzip2 +SSP_UNSAFE= yes # cross-LD does not support -fstack-protector + +U_BOOT_DIR= share/u-boot/${PORTNAME}${PKGNAMESUFFIX} +PLIST_FILES= ${U_BOOT_DIR}/u-boot.img \ + ${U_BOOT_DIR}/u-boot-sunxi-with-spl.bin \ + ${U_BOOT_DIR}/sunxi-spl.bin \ + ${U_BOOT_DIR}/README + +MAKE_ARGS+= ARCH=arm \ + CROSS_COMPILE=arm-none-eabi- + +post-patch: + @${REINPLACE_CMD} -e "s,%%MODEL%%,${MODEL}," \ + ${WRKSRC}/include/configs/sunxi-common.h + +do-configure: + (cd ${WRKSRC}; ${GMAKE} ${CONF_TARGET}) + +do-install: + ${MKDIR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} + ${CP} ${WRKSRC}/spl/sunxi-spl.bin ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} + ${CP} ${WRKSRC}/u-boot-sunxi-with-spl.bin ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} + ${CP} ${WRKSRC}/u-boot.img ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} + ${CP} ${.CURDIR}/pkg-descr ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README + +.include Property changes on: head/sysutils/u-boot-cubieboard/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/u-boot-cubieboard/distinfo =================================================================== --- head/sysutils/u-boot-cubieboard/distinfo (nonexistent) +++ head/sysutils/u-boot-cubieboard/distinfo (revision 391476) @@ -0,0 +1,2 @@ +SHA256 (u-boot-2015.04.tar.bz2) = 0a1a70df586655f527befa6f12e184e96ed61b126e5a567382321b17200f5d60 +SIZE (u-boot-2015.04.tar.bz2) = 9471487 Property changes on: head/sysutils/u-boot-cubieboard/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/u-boot-cubieboard/files/patch-api_api.c =================================================================== --- head/sysutils/u-boot-cubieboard/files/patch-api_api.c (nonexistent) +++ head/sysutils/u-boot-cubieboard/files/patch-api_api.c (revision 391476) @@ -0,0 +1,79 @@ +--- api/api.c.orig 2015-04-13 14:53:03 UTC ++++ api/api.c +@@ -495,45 +495,47 @@ static int API_env_set(va_list ap) + */ + static int API_env_enum(va_list ap) + { +- int i, n; +- char *last, **next; ++ int i; ++ char *last, **next, *s; ++ ENTRY *match, search; ++ static char *buf; + + last = (char *)va_arg(ap, u_int32_t); + + if ((next = (char **)va_arg(ap, u_int32_t)) == NULL) + return API_EINVAL; + +- if (last == NULL) +- /* start over */ +- *next = ((char *)env_get_addr(0)); +- else { +- *next = last; +- +- for (i = 0; env_get_char(i) != '\0'; i = n + 1) { +- for (n = i; env_get_char(n) != '\0'; ++n) { +- if (n >= CONFIG_ENV_SIZE) { +- /* XXX shouldn't we set *next = NULL?? */ +- return 0; +- } +- } +- +- if (envmatch((uchar *)last, i) < 0) +- continue; +- +- /* try to get next name */ +- i = n + 1; +- if (env_get_char(i) == '\0') { +- /* no more left */ +- *next = NULL; +- return 0; +- } +- +- *next = ((char *)env_get_addr(i)); +- return 0; ++ /* ++ * This leverages realloc's behavior of growing but never shrinking the ++ * existing buffer. ++ */ ++ if (last == NULL) { ++ i = 0; ++ buf = realloc(buf, 512); /* Start with reasonable size buf. */ ++ } else { ++ buf = realloc(buf, strlen(last) + 1); ++ strcpy(buf, last); ++ if ((s = strchr(buf, '=')) != NULL) ++ *s = 0; ++ search.key = buf; ++ if ((i = hsearch_r(search, FIND, &match, &env_htab, 0)) == 0) { ++ i = API_EINVAL; ++ goto done; + } + } + ++ /* hmatch on empty string is effectively "get next entry after i". */ ++ if ((i = hmatch_r("", i, &match, &env_htab)) == 0) ++ goto done; ++ buf = realloc(buf, strlen(match->key) + strlen(match->data) + 2); ++ snprintf(buf, buflen, "%s=%s", match->key, match->data); ++ *next = buf; + return 0; ++done: ++ free(buf); ++ buf = NULL; ++ *next = NULL; ++ return i; + } + + /* Property changes on: head/sysutils/u-boot-cubieboard/files/patch-api_api.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/u-boot-cubieboard/files/patch-api_api__storage.c =================================================================== --- head/sysutils/u-boot-cubieboard/files/patch-api_api__storage.c (nonexistent) +++ head/sysutils/u-boot-cubieboard/files/patch-api_api__storage.c (revision 391476) @@ -0,0 +1,28 @@ +--- api/api_storage.c.orig 2015-04-13 14:53:03 UTC ++++ api/api_storage.c +@@ -107,10 +107,13 @@ static int dev_stor_get(int type, int fi + + if (first) { + di->cookie = (void *)get_dev(specs[type].name, 0); +- if (di->cookie == NULL) ++ if (di->cookie == NULL) { + return 0; +- else ++ } else { + found = 1; ++ if (specs[type].max_dev > 1) ++ *more = 1; ++ } + + } else { + for (i = 0; i < specs[type].max_dev; i++) +@@ -146,7 +149,8 @@ static int dev_stor_get(int type, int fi + dd = (block_dev_desc_t *)di->cookie; + if (dd->type == DEV_TYPE_UNKNOWN) { + debugf("device instance exists, but is not active.."); +- found = 0; ++ di->di_stor.block_count = 0; ++ di->di_stor.block_size = 0; + } else { + di->di_stor.block_count = dd->lba; + di->di_stor.block_size = dd->blksz; Property changes on: head/sysutils/u-boot-cubieboard/files/patch-api_api__storage.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/u-boot-cubieboard/files/patch-common_cmd__elf.c =================================================================== --- head/sysutils/u-boot-cubieboard/files/patch-common_cmd__elf.c (nonexistent) +++ head/sysutils/u-boot-cubieboard/files/patch-common_cmd__elf.c (revision 391476) @@ -0,0 +1,29 @@ +--- common/cmd_elf.c.orig 2015-04-13 14:53:03 UTC ++++ common/cmd_elf.c +@@ -35,22 +35,12 @@ static unsigned long do_bootelf_exec(ulo + unsigned long ret; + + /* +- * QNX images require the data cache is disabled. +- * Data cache is already flushed, so just turn it off. +- */ +- int dcache = dcache_status(); +- if (dcache) +- dcache_disable(); +- +- /* +- * pass address parameter as argv[0] (aka command name), +- * and all remaining args ++ * FreeBSD wants the caches enabled while ubldr runs, and as of r276397 ++ * the kernel can tolerate being entered with internal (but not external ++ * PL310) caches enabled on armv6/7 systems. So don't disable caches ++ * here, just launch the program directly. + */ + ret = entry(argc, argv); +- +- if (dcache) +- dcache_enable(); +- + return ret; + } + Property changes on: head/sysutils/u-boot-cubieboard/files/patch-common_cmd__elf.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/u-boot-cubieboard/files/patch-common_cmd__test.c =================================================================== --- head/sysutils/u-boot-cubieboard/files/patch-common_cmd__test.c (nonexistent) +++ head/sysutils/u-boot-cubieboard/files/patch-common_cmd__test.c (revision 391476) @@ -0,0 +1,19 @@ +--- common/cmd_test.c.orig 2015-04-13 14:53:03 UTC ++++ common/cmd_test.c +@@ -65,9 +65,14 @@ static int do_test(cmd_tbl_t *cmdtp, int + char * const *ap; + int i, op, left, adv, expr, last_expr, last_unop, last_binop; + +- /* args? */ +- if (argc < 3) ++ /* ++ * If no args, that's bogus, return false. ++ * If op is -z and no other args, answer is Yes, string is empty. ++ */ ++ if (argc < 2) + return 1; ++ else if (argc == 2) ++ return !(strcmp(argv[1], "-z") == 0); + + #ifdef DEBUG + { Property changes on: head/sysutils/u-boot-cubieboard/files/patch-common_cmd__test.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/u-boot-cubieboard/files/patch-drivers_mmc_mmc.c =================================================================== --- head/sysutils/u-boot-cubieboard/files/patch-drivers_mmc_mmc.c (nonexistent) +++ head/sysutils/u-boot-cubieboard/files/patch-drivers_mmc_mmc.c (revision 391476) @@ -0,0 +1,80 @@ +--- drivers/mmc/mmc.c.orig 2015-04-13 14:53:03 UTC ++++ drivers/mmc/mmc.c +@@ -20,6 +20,7 @@ + + static struct list_head mmc_devices; + static int cur_dev_num = -1; ++static int mmc_error_print_max = -1; + + __weak int board_mmc_getwp(struct mmc *mmc) + { +@@ -1560,9 +1561,14 @@ void mmc_destroy(struct mmc *mmc) + block_dev_desc_t *mmc_get_dev(int dev) + { + struct mmc *mmc = find_mmc_device(dev); +- if (!mmc || mmc_init(mmc)) ++ if (!mmc) + return NULL; + ++ /* If mmc_init fails, mmc->block_dev will be of type ++ * DEV_TYPE_UNKNOWN with blksz and lba set to zero. ++ */ ++ mmc_init(mmc); ++ + return &mmc->block_dev; + } + #endif +@@ -1594,7 +1600,7 @@ int mmc_start_init(struct mmc *mmc) + err = mmc->cfg->ops->init(mmc); + + if (err) +- return err; ++ goto done; + + mmc->ddr_mode = 0; + mmc_set_bus_width(mmc, 1); +@@ -1604,7 +1610,7 @@ int mmc_start_init(struct mmc *mmc) + err = mmc_go_idle(mmc); + + if (err) +- return err; ++ goto done; + + /* The internal partition reset to user partition(0) at every CMD0*/ + mmc->part_num = 0; +@@ -1621,15 +1627,33 @@ int mmc_start_init(struct mmc *mmc) + + if (err && err != IN_PROGRESS) { + #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) +- printf("Card did not respond to voltage select!\n"); ++ if (mmc_error_print_max < 4) { ++ mmc_error_print_max++; ++ printf("Card did not respond to voltage select!\n"); ++ ++ if (mmc_error_print_max == 4) { ++ printf("Discarding further error messages\n"); ++ } ++ } + #endif +- return UNUSABLE_ERR; ++// return UNUSABLE_ERR; ++ goto done; + } + } + + if (err == IN_PROGRESS) + mmc->init_in_progress = 1; + ++done: ++ if (err) { ++ mmc->has_init = 0; ++ mmc->block_dev.type = DEV_TYPE_UNKNOWN; ++ mmc->block_dev.blksz = 0; ++ mmc->block_dev.lba = 0; ++ } else { ++ mmc->has_init = 1; ++ } ++ + return err; + } + Property changes on: head/sysutils/u-boot-cubieboard/files/patch-drivers_mmc_mmc.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/u-boot-cubieboard/files/patch-include_configs_sunxi-common.h =================================================================== --- head/sysutils/u-boot-cubieboard/files/patch-include_configs_sunxi-common.h (nonexistent) +++ head/sysutils/u-boot-cubieboard/files/patch-include_configs_sunxi-common.h (revision 391476) @@ -0,0 +1,74 @@ +--- include/configs/sunxi-common.h.orig 2015-04-13 14:53:03 UTC ++++ include/configs/sunxi-common.h +@@ -406,4 +406,71 @@ extern int soft_i2c_gpio_scl; + #define CONFIG_EXTRA_ENV_SETTINGS + #endif + ++/***************************************************************************** ++ * FreeBSD customizations from here down. ++ ****************************************************************************/ ++ ++/* Add the API and ELF features needed for ubldr. */ ++#ifndef CONFIG_SPL_BUILD ++#define CONFIG_API ++#define CONFIG_CMD_ELF ++#define CONFIG_CMD_ENV_EXISTS ++#define CONFIG_EFI_PARTITION ++#endif ++ ++/* Turn off dcache. */ ++#ifndef CONFIG_SPL_BUILD ++#define CONFIG_SYS_DCACHE_OFF ++#define CONFIG_CMD_CACHE ++#endif ++ ++/* Save the env to the fat partition. */ ++#ifndef CONFIG_SPL_BUILD ++#undef CONFIG_ENV_IS_NOWHERE ++#undef CONFIG_ENV_IS_IN_NAND ++#undef CONFIG_ENV_IS_IN_MMC ++#undef CONFIG_ENV_IS_IN_SPI_FLASH ++#define CONFIG_ENV_IS_IN_FAT ++#define CONFIG_FAT_WRITE ++#define CONFIG_SYS_MMC_MAX_DEVICE 4 ++#define FAT_ENV_INTERFACE "mmc" ++#define FAT_ENV_DEVICE_AND_PART "0:1" ++#define FAT_ENV_FILE "u-boot.env" ++#endif ++ ++/* Create a small(ish) boot environment for FreeBSD. */ ++#ifndef CONFIG_SPL_BUILD ++#undef CONFIG_EXTRA_ENV_SETTINGS ++#define CONFIG_EXTRA_ENV_SETTINGS \ ++ MEM_LAYOUT_ENV_SETTINGS \ ++ CONSOLE_STDOUT_SETTINGS \ ++ "stdin=serial,usbkbd\0" \ ++ "fdtfile=%%MODEL%%.dtb\0" \ ++ "console=ttyS0,115200\0" \ ++ "Fatboot=" \ ++ "env exists loaderdev || env set loaderdev ${fatdev}; " \ ++ "env exists UserFatboot && run UserFatboot; " \ ++ "echo Booting from: ${fatdev} ${bootfile}; " \ ++ "fatload ${fatdev} ${kernel_addr_r} ${bootfile} && bootelf; " \ ++ "\0" \ ++ "Netboot=" \ ++ "env exists loaderdev || env set loaderdev net; " \ ++ "env exists UserNetboot && run UserNetboot; " \ ++ "dhcp ${kernel_addr_r} ${bootfile} && bootelf; " \ ++ "\0" \ ++ "preboot=usb start; " \ ++ "env exists bootfile || env set bootfile ubldr; " \ ++ "env exists SetupFatdev && run SetupFatdev; " \ ++ "env exists UserPreboot && run UserPreboot; " \ ++ "\0" \ ++ "SetupFatdev=" \ ++ "env exists fatdev || env set fatdev 'mmc 0'; " \ ++ "\0" ++ ++#undef CONFIG_BOOTCOMMAND ++#define CONFIG_BOOTCOMMAND "run Fatboot" ++#undef CONFIG_PREBOOT ++#define CONFIG_PREBOOT "run preboot" ++#endif ++ + #endif /* _SUNXI_COMMON_CONFIG_H */ Property changes on: head/sysutils/u-boot-cubieboard/files/patch-include_configs_sunxi-common.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/u-boot-cubieboard/pkg-descr =================================================================== --- head/sysutils/u-boot-cubieboard/pkg-descr (nonexistent) +++ head/sysutils/u-boot-cubieboard/pkg-descr (revision 391476) @@ -0,0 +1,19 @@ +U-Boot loader for Cubieboard. + +To install this bootloader, follow the instructions in + http://linux-sunxi.org/Bootable_SD_card#Bootloader + +This version is patched so that: + * ELF and API features are enabled. + * The default environment is trimmed to just what's needed to boot. + * The saveenv command writes to the file u-boot.env on the FAT partition. + * The DTB file name is chosen based on the board model and passed to ubldr + using the fdtfile env variable. ubldr loads the DTB from /boot/dtb/ on + the FreeBSD partition. + * By default, it loads ELF ubldr from file ubldr on the FAT partition + to address 0x42000000, and launches it. + +For information about running FreeBSD on Cubieboard, see + https://wiki.freebsd.org/FreeBSD/arm/Allwinner + +For general information about U-Boot see WWW: http://www.denx.de/wiki/U-Boot Property changes on: head/sysutils/u-boot-cubieboard/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/u-boot-cubieboard2/Makefile =================================================================== --- head/sysutils/u-boot-cubieboard2/Makefile (nonexistent) +++ head/sysutils/u-boot-cubieboard2/Makefile (revision 391476) @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PKGNAMESUFFIX= -cubieboard2 + +COMMENT= Cross-build U-Boot loader for Cubieboard2 + +LICENSE= GPLv2 + +# Local overrides +MASTERDIR= ${.CURDIR}/../u-boot-cubieboard +DESCR= ${.CURDIR}/pkg-descr +MODEL= cubieboard2 +CONF_TARGET= Cubieboard2_defconfig + +.include "${MASTERDIR}/Makefile" Property changes on: head/sysutils/u-boot-cubieboard2/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/u-boot-cubieboard2/pkg-descr =================================================================== --- head/sysutils/u-boot-cubieboard2/pkg-descr (nonexistent) +++ head/sysutils/u-boot-cubieboard2/pkg-descr (revision 391476) @@ -0,0 +1,19 @@ +U-Boot loader for Cubieboard2. + +To install this bootloader, follow the instructions in + http://linux-sunxi.org/Bootable_SD_card#Bootloader + +This version is patched so that: + * ELF and API features are enabled. + * The default environment is trimmed to just what's needed to boot. + * The saveenv command writes to the file u-boot.env on the FAT partition. + * The DTB file name is chosen based on the board model and passed to ubldr + using the fdtfile env variable. ubldr loads the DTB from /boot/dtb/ on + the FreeBSD partition. + * By default, it loads ELF ubldr from file ubldr on the FAT partition + to address 0x42000000, and launches it. + +For information about running FreeBSD on Cubieboard, see + https://wiki.freebsd.org/FreeBSD/arm/Allwinner + +For general information about U-Boot see WWW: http://www.denx.de/wiki/U-Boot Property changes on: head/sysutils/u-boot-cubieboard2/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property