diff options
| author | Matt Kraai <kraai@debian.org> | 2001-08-27 18:55:10 +0000 |
|---|---|---|
| committer | Matt Kraai <kraai@debian.org> | 2001-08-27 18:55:10 +0000 |
| commit | 91631011ccac8a6d14c07d8beaaf6456e4ddeffa (patch) | |
| tree | f6fac6544fea719c535c2aa1aec966852fd8aad5 | |
| parent | 863a3e15d6f08e187238ded7fc17422dd947ef1e (diff) | |
| download | busybox-w32-91631011ccac8a6d14c07d8beaaf6456e4ddeffa.tar.gz busybox-w32-91631011ccac8a6d14c07d8beaaf6456e4ddeffa.tar.bz2 busybox-w32-91631011ccac8a6d14c07d8beaaf6456e4ddeffa.zip | |
Remove traces of rpmunpack (patch by Laurence Anderson).
| -rw-r--r-- | applets.h | 3 | ||||
| -rw-r--r-- | applets/usage.h | 5 | ||||
| -rw-r--r-- | docs/busybox_header.pod | 3 | ||||
| -rw-r--r-- | include/applets.h | 3 | ||||
| -rw-r--r-- | include/usage.h | 5 | ||||
| -rw-r--r-- | tests/testcases | 2 | ||||
| -rw-r--r-- | usage.h | 5 |
7 files changed, 2 insertions, 24 deletions
| @@ -362,9 +362,6 @@ | |||
| 362 | #ifdef BB_RPM2CPIO | 362 | #ifdef BB_RPM2CPIO |
| 363 | APPLET(rpm2cpio, rpm2cpio_main, _BB_DIR_USR_BIN) | 363 | APPLET(rpm2cpio, rpm2cpio_main, _BB_DIR_USR_BIN) |
| 364 | #endif | 364 | #endif |
| 365 | #ifdef BB_RPMUNPACK | ||
| 366 | APPLET(rpmunpack, rpmunpack_main, _BB_DIR_USR_BIN) | ||
| 367 | #endif | ||
| 368 | #ifdef BB_SED | 365 | #ifdef BB_SED |
| 369 | APPLET(sed, sed_main, _BB_DIR_BIN) | 366 | APPLET(sed, sed_main, _BB_DIR_BIN) |
| 370 | #endif | 367 | #endif |
diff --git a/applets/usage.h b/applets/usage.h index ac980bf8c..d825131e1 100644 --- a/applets/usage.h +++ b/applets/usage.h | |||
| @@ -1376,11 +1376,6 @@ | |||
| 1376 | #define rpm2cpio_full_usage \ | 1376 | #define rpm2cpio_full_usage \ |
| 1377 | "Outputs a cpio archive of the rpm file." | 1377 | "Outputs a cpio archive of the rpm file." |
| 1378 | 1378 | ||
| 1379 | #define rpmunpack_trivial_usage \ | ||
| 1380 | "< package.rpm | gunzip | cpio -idmuv" | ||
| 1381 | #define rpmunpack_full_usage \ | ||
| 1382 | "Extracts an rpm archive." | ||
| 1383 | |||
| 1384 | #define sed_trivial_usage \ | 1379 | #define sed_trivial_usage \ |
| 1385 | "[-nef] pattern [files...]" | 1380 | "[-nef] pattern [files...]" |
| 1386 | #define sed_full_usage \ | 1381 | #define sed_full_usage \ |
diff --git a/docs/busybox_header.pod b/docs/busybox_header.pod index 84a2a5f44..764d6e35f 100644 --- a/docs/busybox_header.pod +++ b/docs/busybox_header.pod | |||
| @@ -63,7 +63,7 @@ hostname, id, ifconfig, init, insmod, kill, killall, klogd, length, ln, | |||
| 63 | loadacm, loadfont, loadkmap, logger, logname, ls, lsmod, makedevs, md5sum, | 63 | loadacm, loadfont, loadkmap, logger, logname, ls, lsmod, makedevs, md5sum, |
| 64 | mkdir, mkfifo, mkfs.minix, mknod, mkswap, mktemp, more, mount, mt, mv, nc, | 64 | mkdir, mkfifo, mkfs.minix, mknod, mkswap, mktemp, more, mount, mt, mv, nc, |
| 65 | nslookup, ping, pivot_root, poweroff, printf, ps, pwd, rdate, readlink, reboot, | 65 | nslookup, ping, pivot_root, poweroff, printf, ps, pwd, rdate, readlink, reboot, |
| 66 | renice, reset, rm, rmdir, rmmod, route, rpm2cpio, rpmunpack, sed, setkeycodes, | 66 | renice, reset, rm, rmdir, rmmod, route, rpm2cpio, sed, setkeycodes, |
| 67 | sh, sleep, sort, stty, swapoff, swapon, sync, syslogd, tail, tar, tee, telnet, | 67 | sh, sleep, sort, stty, swapoff, swapon, sync, syslogd, tail, tar, tee, telnet, |
| 68 | test, tftp, touch, tr, true, tty, umount, uname, uniq, unix2dos, update, uptime, | 68 | test, tftp, touch, tr, true, tty, umount, uname, uniq, unix2dos, update, uptime, |
| 69 | usleep, uudecode, uuencode, watchdog, wc, wget, which, whoami, xargs, yes, zcat, | 69 | usleep, uudecode, uuencode, watchdog, wc, wget, which, whoami, xargs, yes, zcat, |
| @@ -71,3 +71,4 @@ usleep, uudecode, uuencode, watchdog, wc, wget, which, whoami, xargs, yes, zcat, | |||
| 71 | 71 | ||
| 72 | =over 4 | 72 | =over 4 |
| 73 | 73 | ||
| 74 | |||
diff --git a/include/applets.h b/include/applets.h index 41b783862..2388c159e 100644 --- a/include/applets.h +++ b/include/applets.h | |||
| @@ -362,9 +362,6 @@ | |||
| 362 | #ifdef BB_RPM2CPIO | 362 | #ifdef BB_RPM2CPIO |
| 363 | APPLET(rpm2cpio, rpm2cpio_main, _BB_DIR_USR_BIN) | 363 | APPLET(rpm2cpio, rpm2cpio_main, _BB_DIR_USR_BIN) |
| 364 | #endif | 364 | #endif |
| 365 | #ifdef BB_RPMUNPACK | ||
| 366 | APPLET(rpmunpack, rpmunpack_main, _BB_DIR_USR_BIN) | ||
| 367 | #endif | ||
| 368 | #ifdef BB_SED | 365 | #ifdef BB_SED |
| 369 | APPLET(sed, sed_main, _BB_DIR_BIN) | 366 | APPLET(sed, sed_main, _BB_DIR_BIN) |
| 370 | #endif | 367 | #endif |
diff --git a/include/usage.h b/include/usage.h index ac980bf8c..d825131e1 100644 --- a/include/usage.h +++ b/include/usage.h | |||
| @@ -1376,11 +1376,6 @@ | |||
| 1376 | #define rpm2cpio_full_usage \ | 1376 | #define rpm2cpio_full_usage \ |
| 1377 | "Outputs a cpio archive of the rpm file." | 1377 | "Outputs a cpio archive of the rpm file." |
| 1378 | 1378 | ||
| 1379 | #define rpmunpack_trivial_usage \ | ||
| 1380 | "< package.rpm | gunzip | cpio -idmuv" | ||
| 1381 | #define rpmunpack_full_usage \ | ||
| 1382 | "Extracts an rpm archive." | ||
| 1383 | |||
| 1384 | #define sed_trivial_usage \ | 1379 | #define sed_trivial_usage \ |
| 1385 | "[-nef] pattern [files...]" | 1380 | "[-nef] pattern [files...]" |
| 1386 | #define sed_full_usage \ | 1381 | #define sed_full_usage \ |
diff --git a/tests/testcases b/tests/testcases index 4708e54e2..2aad9b651 100644 --- a/tests/testcases +++ b/tests/testcases | |||
| @@ -294,8 +294,6 @@ route | |||
| 294 | 294 | ||
| 295 | # rpm2cpio | 295 | # rpm2cpio |
| 296 | 296 | ||
| 297 | # rpmunpack | ||
| 298 | |||
| 299 | # sed - we can do some one-liners here, some testing is a little | 297 | # sed - we can do some one-liners here, some testing is a little |
| 300 | # difficult to do in just this space (like a,i,c cmds). | 298 | # difficult to do in just this space (like a,i,c cmds). |
| 301 | 299 | ||
| @@ -1376,11 +1376,6 @@ | |||
| 1376 | #define rpm2cpio_full_usage \ | 1376 | #define rpm2cpio_full_usage \ |
| 1377 | "Outputs a cpio archive of the rpm file." | 1377 | "Outputs a cpio archive of the rpm file." |
| 1378 | 1378 | ||
| 1379 | #define rpmunpack_trivial_usage \ | ||
| 1380 | "< package.rpm | gunzip | cpio -idmuv" | ||
| 1381 | #define rpmunpack_full_usage \ | ||
| 1382 | "Extracts an rpm archive." | ||
| 1383 | |||
| 1384 | #define sed_trivial_usage \ | 1379 | #define sed_trivial_usage \ |
| 1385 | "[-nef] pattern [files...]" | 1380 | "[-nef] pattern [files...]" |
| 1386 | #define sed_full_usage \ | 1381 | #define sed_full_usage \ |