OpenWrt – Diff between revs 2 and 3
?pathlinks?
| Rev 2 | Rev 3 | |||
|---|---|---|---|---|
| Line 6... | Line 6... | |||
| 6 | # |
6 | # |
|
| Line 7... | Line 7... | |||
| 7 | |
7 | |
|
| Line 8... | Line 8... | |||
| 8 | include $(TOPDIR)/rules.mk |
8 | include $(TOPDIR)/rules.mk |
|
| 9 | |
9 | |
|
| 10 | PKG_NAME:=util-linux |
10 | PKG_NAME:=util-linux |
|
| Line 11... | Line 11... | |||
| 11 | PKG_VERSION:=2.33 |
11 | PKG_VERSION:=2.32 |
|
| 12 | PKG_RELEASE:=2 |
12 | PKG_RELEASE:=2 |
|
| 13 | |
13 | |
|
| 14 | PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz |
14 | PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz |
|
| Line 15... | Line 15... | |||
| 15 | PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.33 |
15 | PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.32 |
|
| 16 | PKG_HASH:=f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a |
16 | PKG_HASH:=6c7397abc764e32e8159c2e96042874a190303e77adceb4ac5bd502a272a4734 |
|
| 17 | PKG_CPE_ID:=cpe:/a:kernel:util-linux |
17 | PKG_CPE_ID:=cpe:/a:kernel:util-linux |
|
| Line 45... | Line 45... | |||
| 45 | $(call Package/util-linux/Default) |
45 | $(call Package/util-linux/Default) |
|
| 46 | DEPENDS:=+libuuid |
46 | DEPENDS:=+libuuid |
|
| 47 | TITLE:=block device id library |
47 | TITLE:=block device id library |
|
| 48 | SECTION:=libs |
48 | SECTION:=libs |
|
| 49 | CATEGORY:=Libraries |
49 | CATEGORY:=Libraries |
|
| 50 | ABI_VERSION:=1 |
- | ||
| 51 | endef |
50 | endef |
|
| Line 52... | Line 51... | |||
| 52 | |
51 | |
|
| 53 | define Package/libblkid/description |
52 | define Package/libblkid/description |
|
| 54 | The libblkid library is used to identify block devices (disks) as to their |
53 | The libblkid library is used to identify block devices (disks) as to their |
|
| Line 61... | Line 60... | |||
| 61 | $(call Package/util-linux/Default) |
60 | $(call Package/util-linux/Default) |
|
| 62 | DEPENDS:=+libuuid +libblkid |
61 | DEPENDS:=+libuuid +libblkid |
|
| 63 | TITLE:=partition manipulating library |
62 | TITLE:=partition manipulating library |
|
| 64 | SECTION:=libs |
63 | SECTION:=libs |
|
| 65 | CATEGORY:=Libraries |
64 | CATEGORY:=Libraries |
|
| 66 | ABI_VERSION:=1 |
- | ||
| 67 | endef |
65 | endef |
|
| Line 68... | Line 66... | |||
| 68 | |
66 | |
|
| 69 | define Package/libfdisk/description |
67 | define Package/libfdisk/description |
|
| 70 | The libfdisk library is used for manipulating with partition tables. |
68 | The libfdisk library is used for manipulating with partition tables. |
|
| Line 74... | Line 72... | |||
| 74 | $(call Package/util-linux/Default) |
72 | $(call Package/util-linux/Default) |
|
| 75 | DEPENDS:=+libblkid |
73 | DEPENDS:=+libblkid |
|
| 76 | TITLE:=mount library |
74 | TITLE:=mount library |
|
| 77 | SECTION:=libs |
75 | SECTION:=libs |
|
| 78 | CATEGORY:=Libraries |
76 | CATEGORY:=Libraries |
|
| 79 | ABI_VERSION:=1 |
- | ||
| 80 | endef |
77 | endef |
|
| Line 81... | Line 78... | |||
| 81 | |
78 | |
|
| 82 | define Package/libmount/description |
79 | define Package/libmount/description |
|
| 83 | The libmount library is used to parse /etc/fstab, /etc/mtab and |
80 | The libmount library is used to parse /etc/fstab, /etc/mtab and |
|
| Line 87... | Line 84... | |||
| 87 | define Package/libuuid |
84 | define Package/libuuid |
|
| 88 | $(call Package/util-linux/Default) |
85 | $(call Package/util-linux/Default) |
|
| 89 | TITLE:=DCE compatible Universally Unique Identifier library |
86 | TITLE:=DCE compatible Universally Unique Identifier library |
|
| 90 | SECTION:=libs |
87 | SECTION:=libs |
|
| 91 | CATEGORY:=Libraries |
88 | CATEGORY:=Libraries |
|
| 92 | ABI_VERSION:=1 |
- | ||
| 93 | endef |
89 | endef |
|
| Line 94... | Line 90... | |||
| 94 | |
90 | |
|
| 95 | define Package/libuuid/description |
91 | define Package/libuuid/description |
|
| 96 | The UUID library is used to generate unique identifiers for objects |
92 | The UUID library is used to generate unique identifiers for objects |
|
| Line 102... | Line 98... | |||
| 102 | define Package/libsmartcols |
98 | define Package/libsmartcols |
|
| 103 | $(call Package/util-linux/Default) |
99 | $(call Package/util-linux/Default) |
|
| 104 | TITLE:=table or tree library |
100 | TITLE:=table or tree library |
|
| 105 | SECTION:=libs |
101 | SECTION:=libs |
|
| 106 | CATEGORY:=Libraries |
102 | CATEGORY:=Libraries |
|
| 107 | ABI_VERSION:=1 |
- | ||
| 108 | endef |
103 | endef |
|
| Line 109... | Line 104... | |||
| 109 | |
104 | |
|
| 110 | define Package/libsmartcols/description |
105 | define Package/libsmartcols/description |
|
| 111 | The smartcols library is used to print tables and trees in a pretty way. |
106 | The smartcols library is used to print tables and trees in a pretty way. |
|
| Line 144... | Line 139... | |||
| 144 | define Package/blkid/description |
139 | define Package/blkid/description |
|
| 145 | The blkid program is the command-line interface to working with the libblkid |
140 | The blkid program is the command-line interface to working with the libblkid |
|
| 146 | library. |
141 | library. |
|
| 147 | endef |
142 | endef |
|
| Line 148... | Line -... | |||
| 148 | |
- | ||
| 149 | define Package/blockdev |
- | ||
| 150 | $(call Package/util-linux/Default) |
- | ||
| 151 | TITLE:=call block device ioctls from the command line |
- | ||
| 152 | SUBMENU=Disc |
- | ||
| 153 | endef |
- | ||
| 154 | |
- | ||
| 155 | define Package/blockdev/description |
- | ||
| 156 | The blockdev program is the command-line interface to call block device ioctls. |
- | ||
| 157 | endef |
- | ||
| 158 | |
143 | |
|
| 159 | define Package/cal |
144 | define Package/cal |
|
| 160 | $(call Package/util-linux/Default) |
145 | $(call Package/util-linux/Default) |
|
| 161 | TITLE:=display a calendar |
146 | TITLE:=display a calendar |
|
| 162 | DEPENDS:= +libncurses |
147 | DEPENDS:= +libncurses |
|
| Line 185... | Line 170... | |||
| 185 | |
170 | |
|
| 186 | define Package/dmesg/description |
171 | define Package/dmesg/description |
|
| 187 | dmesg is used to examine or control the kernel ring buffer |
172 | dmesg is used to examine or control the kernel ring buffer |
|
| Line 188... | Line -... | |||
| 188 | endef |
- | ||
| 189 | |
- | ||
| 190 | define Package/eject |
- | ||
| 191 | $(call Package/util-linux/Default) |
- | ||
| 192 | TITLE:=eject removable media |
- | ||
| 193 | DEPENDS:= +libblkid +libmount +libuuid |
- | ||
| 194 | SUBMENU=Disc |
- | ||
| 195 | endef |
- | ||
| 196 | |
- | ||
| 197 | define Package/eject/description |
- | ||
| 198 | eject allows removable media (typically a CD-ROM, floppy disk, tape, or JAZ |
- | ||
| 199 | or ZIP disk) to be ejected under software control. |
- | ||
| 200 | endef |
173 | endef |
|
| 201 | |
174 | |
|
| 202 | define Package/fdisk |
175 | define Package/fdisk |
|
| 203 | $(call Package/util-linux/Default) |
176 | $(call Package/util-linux/Default) |
|
| 204 | TITLE:=manipulate disk partition table |
177 | TITLE:=manipulate disk partition table |
|
| Line 547... | Line 520... | |||
| 547 | endef |
520 | endef |
|
| Line 548... | Line 521... | |||
| 548 | |
521 | |
|
| 549 | |
522 | |
|
| 550 | define Package/libfdisk/install |
523 | define Package/libfdisk/install |
|
| - | 524 | $(INSTALL_DIR) $(1)/usr/lib |
||
| 551 | $(INSTALL_DIR) $(1)/usr/lib |
525 | $(CP) $(PKG_INSTALL_DIR)/lib/libfdisk.so* $(1)/usr/lib/ |
|
| Line 552... | Line 526... | |||
| 552 | $(CP) $(PKG_INSTALL_DIR)/lib/libfdisk.so.* $(1)/usr/lib/ |
526 | $(LN) libfdisk.so.1 $(1)/usr/lib/libfdisk.so |
|
| 553 | endef |
527 | endef |
|
| 554 | |
528 | |
|
| - | 529 | define Package/libblkid/install |
||
| 555 | define Package/libblkid/install |
530 | $(INSTALL_DIR) $(1)/usr/lib |
|
| Line 556... | Line 531... | |||
| 556 | $(INSTALL_DIR) $(1)/usr/lib |
531 | $(CP) $(PKG_INSTALL_DIR)/lib/libblkid.so* $(1)/usr/lib/ |
|
| 557 | $(CP) $(PKG_INSTALL_DIR)/lib/libblkid.so.* $(1)/usr/lib/ |
532 | $(LN) libblkid.so.1 $(1)/usr/lib/libblkid.so |
|
| 558 | endef |
533 | endef |
|
| - | 534 | |
||
| 559 | |
535 | define Package/libmount/install |
|
| Line 560... | Line 536... | |||
| 560 | define Package/libmount/install |
536 | $(INSTALL_DIR) $(1)/usr/lib |
|
| 561 | $(INSTALL_DIR) $(1)/usr/lib |
537 | $(CP) $(PKG_INSTALL_DIR)/lib/libmount.so* $(1)/usr/lib/ |
|
| 562 | $(CP) $(PKG_INSTALL_DIR)/lib/libmount.so.* $(1)/usr/lib/ |
538 | $(LN) libmount.so.1 $(1)/usr/lib/libmount.so |
|
| - | 539 | endef |
||
| 563 | endef |
540 | |
|
| Line 564... | Line 541... | |||
| 564 | |
541 | define Package/libsmartcols/install |
|
| 565 | define Package/libsmartcols/install |
542 | $(INSTALL_DIR) $(1)/usr/lib |
|
| 566 | $(INSTALL_DIR) $(1)/usr/lib |
543 | $(CP) $(PKG_INSTALL_DIR)/lib/libsmartcols.so* $(1)/usr/lib/ |
|
| - | 544 | $(LN) libsmartcols.so.1 $(1)/usr/lib/libsmartcols.so |
||
| 567 | $(CP) $(PKG_INSTALL_DIR)/lib/libsmartcols.so.* $(1)/usr/lib/ |
545 | endef |
|
| Line 568... | Line 546... | |||
| 568 | endef |
546 | |
|
| 569 | |
547 | define Package/libuuid/install |
|
| 570 | define Package/libuuid/install |
548 | $(INSTALL_DIR) $(1)/usr/lib |
|
| Line 585... | Line 563... | |||
| 585 | define Package/blkid/install |
563 | define Package/blkid/install |
|
| 586 | $(INSTALL_DIR) $(1)/usr/sbin |
564 | $(INSTALL_DIR) $(1)/usr/sbin |
|
| 587 | $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/blkid $(1)/usr/sbin/ |
565 | $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/blkid $(1)/usr/sbin/ |
|
| 588 | endef |
566 | endef |
|
| Line 589... | Line -... | |||
| 589 | |
- | ||
| 590 | define Package/blockdev/install |
- | ||
| 591 | $(INSTALL_DIR) $(1)/usr/sbin |
- | ||
| 592 | $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/blockdev $(1)/usr/sbin/ |
- | ||
| 593 | endef |
- | ||
| 594 | |
567 | |
|
| 595 | define Package/cal/install |
568 | define Package/cal/install |
|
| 596 | $(INSTALL_DIR) $(1)/usr/bin |
569 | $(INSTALL_DIR) $(1)/usr/bin |
|
| 597 | $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cal $(1)/usr/bin/ |
570 | $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cal $(1)/usr/bin/ |
|
| Line 605... | Line 578... | |||
| 605 | define Package/dmesg/install |
578 | define Package/dmesg/install |
|
| 606 | $(INSTALL_DIR) $(1)/usr/bin |
579 | $(INSTALL_DIR) $(1)/usr/bin |
|
| 607 | $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dmesg $(1)/usr/bin/ |
580 | $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dmesg $(1)/usr/bin/ |
|
| 608 | endef |
581 | endef |
|
| Line 609... | Line -... | |||
| 609 | |
- | ||
| 610 | define Package/eject/install |
- | ||
| 611 | $(INSTALL_DIR) $(1)/usr/bin |
- | ||
| 612 | $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/eject $(1)/usr/bin/ |
- | ||
| 613 | endef |
- | ||
| 614 | |
582 | |
|
| 615 | define Package/fdisk/install |
583 | define Package/fdisk/install |
|
| 616 | $(INSTALL_DIR) $(1)/usr/sbin |
584 | $(INSTALL_DIR) $(1)/usr/sbin |
|
| 617 | $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fdisk $(1)/usr/sbin/ |
585 | $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fdisk $(1)/usr/sbin/ |
|
| Line 764... | Line 732... | |||
| 764 | $(eval $(call BuildPackage,libsmartcols)) |
732 | $(eval $(call BuildPackage,libsmartcols)) |
|
| 765 | $(eval $(call BuildPackage,libuuid)) |
733 | $(eval $(call BuildPackage,libuuid)) |
|
| 766 | $(eval $(call BuildPackage,agetty)) |
734 | $(eval $(call BuildPackage,agetty)) |
|
| 767 | $(eval $(call BuildPackage,blkdiscard)) |
735 | $(eval $(call BuildPackage,blkdiscard)) |
|
| 768 | $(eval $(call BuildPackage,blkid)) |
736 | $(eval $(call BuildPackage,blkid)) |
|
| 769 | $(eval $(call BuildPackage,blockdev)) |
- | ||
| 770 | $(eval $(call BuildPackage,cal)) |
737 | $(eval $(call BuildPackage,cal)) |
|
| 771 | $(eval $(call BuildPackage,cfdisk)) |
738 | $(eval $(call BuildPackage,cfdisk)) |
|
| 772 | $(eval $(call BuildPackage,dmesg)) |
739 | $(eval $(call BuildPackage,dmesg)) |
|
| 773 | $(eval $(call BuildPackage,eject)) |
- | ||
| 774 | $(eval $(call BuildPackage,fdisk)) |
740 | $(eval $(call BuildPackage,fdisk)) |
|
| 775 | $(eval $(call BuildPackage,findfs)) |
741 | $(eval $(call BuildPackage,findfs)) |
|
| 776 | $(eval $(call BuildPackage,flock)) |
742 | $(eval $(call BuildPackage,flock)) |
|
| 777 | $(eval $(call BuildPackage,fstrim)) |
743 | $(eval $(call BuildPackage,fstrim)) |
|
| 778 | $(eval $(call BuildPackage,getopt)) |
744 | $(eval $(call BuildPackage,getopt)) |
|