packaging: symlinks-full: Rename conflcit tools in /usr/bin

Change-Id: I8478eb078bd08ba66f00ba94a9bcf57dadfb6083
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/packaging/toybox.spec b/packaging/toybox.spec
index 07d23e8..c875a22 100644 (file)
--- a/packaging/toybox.spec
+++ b/packaging/toybox.spec
@@ -161,11 +161,14 @@ pushd %{_bindir} && ./toybox-full ln -s ./toybox-full ./toybox && popd
 %defattr(-,root,root,-)
 %{_bindir}/ping6
 
+%post symlinks-nslookup
+mv /usr/bin/toybox-nslookup /usr/bin/nslookup
+
 %files symlinks-nslookup
 %manifest toybox.manifest
 %license LICENSE.BSD
 %defattr(-,root,root,-)
-%{_bindir}/nslookup
+%{_bindir}/toybox-nslookup
 
 
 %changelog

diff --git a/packaging/usrbin.links b/packaging/usrbin.links
index c5b3761..2f3fb7d 100644 (file)
--- a/packaging/usrbin.links
+++ b/packaging/usrbin.links
@@ -1,207 +1,207 @@
 acpi
-base64
-basename
+toybox-base64
+toybox-basename
 blkid
 blockdev
 bootchartd
 bzcat
-cal
-cat
+toybox-cal
+toybox-cat
 catv
-chattr
-chgrp
-chmod
-chown
-chroot
+toybox-chattr
+toybox-chgrp
+toybox-chmod
+toybox-chown
+toybox-chroot
 chvt
-cksum
+toybox-cksum
 clear
 cmpcommcompress
 count
-cp
+toybox-cp
 cpio
 crond
 crontab
-cut
-date
-dd
-df
+toybox-cut
+toybox-date
+toybox-dd
+toybox-df
 dhcp
 diff
-dirname
-dmesg
+toybox-dirname
+toybox-dmesg
 dos2unix
-du
+toybox-du
 dumpleases
-echo
-egrep
-eject
-env
-expand
-factor
-fallocate
-false
+toybox-echo
+toybox-egrep
+toybox-eject
+toybox-env
+toybox-expand
+toybox-factor
+toybox-fallocate
+toybox-false
 fdisk
-fgrep
-find
-free
+toybox-fgrep
+toybox-find
+toybox-free
 freeramdisk
 fsck
 fsfreeze
 fstype
 getty
-grep
-groups
-gunzip
-gzip
+toybox-grep
+toybox-groups
+toybox-gunzip
+toybox-gzip
 halt
-head
+toybox-head
 help
 hexedit
-host
+toybox-host
 hostname
 hwclock
 toybox-iconv
-id
+toybox-id
 ifconfig
 init
 inotifyd
 insmod
-install
-ionice
+toybox-install
+toybox-ionice
 iorenice
 ip
 ipaddr
-ipcrm
-ipcs
+toybox-ipcrm
+toybox-ipcs
 iplink
 iproute
 iprule
 iptunnel
-kill
+toybox-kill
 killall
 killall5
-last
-link
-ln
-login
-logname
+toybox-last
+toybox-link
+toybox-ln
+toybox-login
+toybox-logname
 losetup
-ls
-lsattr
-lsmod
+toybox-ls
+toybox-lsattr
+toybox-lsmod
 lspci
 lsusb
 makedevs
-md5sum
+toybox-md5sum
 mdev
 mix
-mkdir
-mkfifo
-mknod
+toybox-mkdir
+toybox-mkfifo
+toybox-mknod
 mkpasswd
 mkswap
-mktemp
+toybox-mktemp
 modinfo
 modprobe
-more
-mount
-mountpoint
-mv
+toybox-more
+toybox-mount
+toybox-mountpoint
+toybox-mv
 nbd-client
 nc
 netcat
-netstat
-nice
-nl
-nohup
+toybox-netstat
+toybox-nice
+toybox-nl
+toybox-nohup
 nproc
-nsenter
-nslookup
-od
+toybox-nsenter
+toybox-nslookup
+toybox-od
 oneit
 partprobe
 toybox-passwd
-paste
+toybox-paste
 patch
-pgrep
-pidof
+toybox-pgrep
+toybox-pidof
 ping
 ping6
 pivot_root
-pkill
-pmap
+toybox-pkill
+toybox-pmap
 poweroff
-printenv
-printf
-ps
-pwd
-pwdx
+toybox-printenv
+toybox-printf
+toybox-ps
+toybox-pwd
+toybox-pwdx
 readahead
-readlink
+toybox-readlink
 realpath
 reboot
-renice
+toybox-renice
 reset
-rev
+toybox-rev
 rfkill
-rm
-rmdir
+toybox-rm
+toybox-rmdir
 rmmod
 route
-sed
-seq
-setsid
+toybox-sed
+toybox-seq
+toybox-setsid
 toybox-sh
-sha1sum
-shred
-sleep
-sort
-split
-stat
+toybox-sha1sum
+toybox-shred
+toybox-sleep
+toybox-sort
+toybox-split
+toybox-stat
 strings
 toybox-su
 sulogin
 swapoff
 swapon
 switch_root
-sync
+toybox-sync
 sysctl
-tac
-tail
-tar
-taskset
-tee
+toybox-tac
+toybox-tail
+toybox-tar
+toybox-taskset
+toybox-tee
 telnet
 time
 timeout
-top
-touch
+toybox-top
+toybox-touch
 toysh
 traceroute
 traceroute6
-true
+toybox-true
 truncate
-tty
-umount
-uname
-uniq
+toybox-tty
+toybox-umount
+toybox-uname
+toybox-uniq
 unix2dos
-unlink
-unshare
-uptime
+toybox-unlink
+toybox-unshare
+toybox-uptime
 usleep
 uudecode
 uuencode
 vconfig
-vmstat
-w
-watch
-wc
+toybox-vmstat
+toybox-w
+toybox-watch
+toybox-wc
 which
-who
-whoami
-xargs
+toybox-who
+toybox-whoami
+toybox-xargs
 xxd
-yes
-zcat
+toybox-yes
+toybox-zcat