Skip to content

Commit

Permalink
Merge Official Source
Browse files Browse the repository at this point in the history
Signed-off-by: Tianling Shen <[email protected]>
  • Loading branch information
1715173329 committed Sep 2, 2024
2 parents d2dc07f + c6f9c82 commit 9741251
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 29 deletions.
9 changes: 3 additions & 6 deletions admin/atop/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=atop
PKG_RELEASE:=1
PKG_VERSION:=2.7.1
PKG_VERSION:=2.11.0

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.atoptool.nl/download/
PKG_HASH:=ca48d2f17e071deead5e6e9cc9e388bf6a3270d695e61976b3794d4d927b5c4e
PKG_HASH:=9b94c666602efff7bf402ecce706c347f38c39cb63498f9d39626861e5646e20

PKG_MAINTAINER:=Toni Uhlig <[email protected]>
PKG_LICENSE:=GPL-2.0-or-later
Expand All @@ -24,7 +24,7 @@ define Package/atop
SECTION:=admin
CATEGORY:=Administration
TITLE:=System and process monitor for Linux
DEPENDS:=+zlib +libncurses
DEPENDS:=+zlib +libncurses +glib2
URL:=https://www.atoptool.nl/
endef

Expand All @@ -44,9 +44,6 @@ define Package/atop/description
network activity per process/thread.
endef

MAKE_FLAGS += \
CFLAGS+="-Wno-misleading-indentation -Wno-unused-const-variable -Wno-format-truncation"

define Package/atop/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/atop $(1)/usr/bin/
Expand Down
11 changes: 0 additions & 11 deletions admin/atop/patches/010-makefile-missing-cflags.patch

This file was deleted.

11 changes: 5 additions & 6 deletions multimedia/tvheadend/Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=tvheadend
PKG_VERSION:=2023-06-05
PKG_RELEASE:=2
PKG_RELEASE:=1

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/tvheadend/tvheadend.git
PKG_MIRROR_HASH:=9c640c7697eaf2deca64d3994fd655288f96f7118a88a649bd8614a6164bd30f
PKG_SOURCE_VERSION:=003fd92707531bdf7ad1753ab028db8748ac5ab8
PKG_SOURCE_DATE:=2023-06-05
PKG_SOURCE_URL:=https://github.com/tvheadend/tvheadend
PKG_MIRROR_HASH:=0dbdc13634db4150e772aec8da730ffb7f0cadf3d3c46158a422a7dada16dcfc
PKG_SOURCE_VERSION:=adef81b8d2a6edb3a665679f394bac05b7dc91c8
PKG_SOURCE_DATE:=2024-08-12

PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=LICENSE.md
Expand Down
4 changes: 2 additions & 2 deletions net/i2pd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=i2pd
PKG_VERSION:=2.50.2
PKG_VERSION:=2.53.1
PKG_RELEASE:=1
PKG_BUILD_PARALLEL:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/PurpleI2P/i2pd/tar.gz/$(PKG_VERSION)?
PKG_HASH:=ae2ec4732c38fda71b4b48ce83624dd8b2e05083f2c94a03d20cafb616f63ca5
PKG_HASH:=c6863d853905e7594ea661595ea591055f8f2f018b9b90507d5a43a6456188ea

PKG_MAINTAINER:=David Yang <[email protected]>
PKG_LICENSE:=BSD-3-Clause
Expand Down
4 changes: 2 additions & 2 deletions utils/bash/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=bash
PKG_VERSION:=5.2.21
PKG_VERSION:=5.2.32
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/bash
PKG_HASH:=c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8
PKG_HASH:=d3ef80d2b67d8cbbe4d3265c63a72c46f9b278ead6e0e06d61801b58f23f50b5

PKG_MAINTAINER:=Marcel Denia <[email protected]>
PKG_LICENSE:=GPL-3.0-or-later
Expand Down
4 changes: 2 additions & 2 deletions utils/uhubctl/Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=uhubctl
PKG_VERSION:=2.5.0
PKG_VERSION:=2.6.0
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/mvp/uhubctl/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=d4452252f7862f7a45dd9c62f2ea7cd3a57ab5f5ab0e54a857d4c695699bbba3
PKG_HASH:=56ca15ddf96d39ab0bf8ee12d3daca13cea45af01bcd5a9732ffcc01664fdfa2

PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=COPYING LICENSE
Expand Down

0 comments on commit 9741251

Please sign in to comment.