re-enable ubirsvol, Diablo uses a separate busybox config file now

This reverts commit 6db1b31759a203c5c3a19be58e99f362fd8799e5.

diff --git a/debian/config/config.busybox b/debian/config/config.busybox
index 4ee5d03..13fa1df 100644 (file)
--- a/debian/config/config.busybox
+++ b/debian/config/config.busybox
@@ -651,7 +651,7 @@ CONFIG_SETSERIAL=y
 # CONFIG_UBIDETACH is not set
 # CONFIG_UBIMKVOL is not set
 # CONFIG_UBIRMVOL is not set
-# CONFIG_UBIRSVOL is not set
+CONFIG_UBIRSVOL=y
 # CONFIG_UBIUPDATEVOL is not set
 CONFIG_ADJTIMEX=y
 # CONFIG_BBCONFIG is not set

diff --git a/debian/control b/debian/control
index 1084a2e..d49aca0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Description: Tiny utilities for small and embedded systems - enhanced package
  dhcprelay dnsd fakeidentd ftpd hdparm httpd ifplugd inetd lspci ntpd
  rdate rdev readprofile remove-shell sendmail sha256sum sha512sum
  telnetd tftpd tunctl udhcpd watchdog zcip whois pstree pwdx groups
- users setserial nameif
+ users setserial nameif ubirsvol
 XB-Maemo-Icon-26:
  iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAGXRFWHRTb2Z0
  d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAACYtJREFUeNrUWkurZUcVXvXY

diff --git a/debian/scripts/applets b/debian/scripts/applets
index e4974b2..324b119 100644 (file)
--- a/debian/scripts/applets
+++ b/debian/scripts/applets
@@ -15,5 +15,5 @@ DESTINATIONS="DEST_BIN DEST_SBIN DEST_USRBIN DEST_USRSBIN"
 DEST_BIN="bunzip2 bzcat bzip2 cpio cttyhack dnsdomainname dumpkmap ed fbset fdflush hush ip ipaddr iplink iproute iprule mountpoint mt nc pipe_progress popmaildir pscan usleep ash cat chgrp chmod chown cp date dd df dmesg echo false hostname ln ls mkdir mknod mktemp more mount mv pidof pwd readlink rm rmdir sed sleep stty sync tar touch true umount uname which grep egrep fgrep run-parts zcat gunzip gzip uncompress sh fsync kill ps fuser netstat groups users setserial su ping ping6 login"
 DEST_SBIN="blkid blockdev bootchartd crond fdisk ifenslave ip iptunnel klogd loadkmap logread makedevs mdev mkdosfs mke2fs mkfs.ext2 mkfs.vfat nbd-client raidautorun runlevel setconsole start-stop-daemon sulogin sysctl syslogd vconfig getty hwclock killall5 losetup mkswap swapoff swapon pivot_root halt reboot poweroff ifconfig nameif route slattach ifdown ifup zcip nameif findfs"
 DEST_USRBIN="adjtimex arping base64 beep brctl cal catv chattr chpst chrt chvt cryptpw dc deallocvt devmem diff dos2unix dumpleases eject envdir envuidgid ether-wake fdformat fgconsole flock freeramdisk ftpget ftpput hexdump ionice iostat ipcalc kbd_mode last length less linux32 linux64 loadfont lpd lpq lpr lsattr lsusb lzcat lzma lzop lzopcat makemime man microcom mkpasswd mpstat nmeter openvt patch pmap readahead reformime resize rev rpm rpm2cpio rtcwake runsv runsvdir rx script scriptreplay setarch setfont setkeycodes setlogcons setuidgid showkey smemcap softlimit strings sv svlogd tcpsvd telnet tftp timeout ttysize udhcpc udpsvd unix2dos unlzma unlzop unxz unzip uudecode uuencode vi volname wall wget xz xzcat zcipice [ [[ awk basename cksum clear cmp comm cut dirname du env expand expr find fold getopt head hostid id install logger logname md5sum mesg mkfifo nice nohup od printenv printf renice reset seq setsid sha1sum sort split stat sum tac tail tee test tr tty unexpand uniq wc which who whoami xargs yes ar time nslookup free pgrep pkill top uptime watch realpath killall chvt deallocvt openvt setkeycodes setlogcons kbd_mode whois pstree pwdx crontab ipcrm ipcs passwd traceroute traceroute6 vlock"
-DEST_USRSBIN="acpid add-shell addgroup adduser arp chat chpasswd delgroup deluser dhcprelay fakeidentd ftpd hdparm httpd ifplugd inetd lspci ntpd rdate rdev readprofile remove-shell sendmail sha256sum sha512sum telnetd tftpd tunctl udhcpd watchdog chroot dnsd"
+DEST_USRSBIN="acpid add-shell addgroup adduser arp chat chpasswd delgroup deluser dhcprelay fakeidentd ftpd hdparm httpd ifplugd inetd lspci ntpd rdate rdev readprofile remove-shell sendmail sha256sum sha512sum telnetd tftpd tunctl udhcpd watchdog chroot ubirsvol dnsd"