Skip to content
Commits on Source (226)
{
"image": "docker.io/openwrt/sdk",
"features": {
}
}
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=iotop
PKG_VERSION:=0.6
PKG_RELEASE:=1
PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://guichaz.free.fr/iotop/files/$(PKG_SOURCE)?
PKG_HASH:=3adea2a24eda49bbbaeb4e6ed2042355b441dbd7161e883067a02bfc8dcef75b
PKG_LICENSE:=GPL
include $(INCLUDE_DIR)/package.mk
include ../../lang/python/python3-package.mk
PYTHON3_PKG_SETUP_ARGS:="--optimize=1"
define Package/iotop
SECTION:=admin
CATEGORY:=Administration
URL:=http://guichaz.free.fr/iotop/
TITLE:=iotop
DEPENDS:=+python3-light
VARIANT:=python3
endef
define Package/iotop/description
Python program with a top like UI used to show of behalf of which process is the I/O going on
endef
$(eval $(call Py3Package,iotop))
$(eval $(call BuildPackage,iotop))
$(eval $(call BuildPackage,iotop-src))
--- ./iotop.py-orig 2013-05-27 00:44:18.000000000 +0200
+++ ./iotop.py 2019-11-26 13:32:22.383729370 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# iotop: Display I/O usage of processes in a top like UI
# Copyright (c) 2007, 2008 Guillaume Chazarain <guichaz@gmail.com>
# GPL version 2 or later
--- ./setup.py-orig 2013-05-27 00:44:18.000000000 +0200
+++ ./setup.py 2019-11-23 02:30:27.237162616 +0100
@@ -7,7 +7,7 @@ from iotop.version import VERSION
# Dirty hack to make setup.py install the iotop script to sbin/ instead of bin/
# while still honoring the choice of installing into local/ or not.
if hasattr(distutils_install, 'INSTALL_SCHEMES'):
- for d in distutils_install.INSTALL_SCHEMES.itervalues():
+ for d in distutils_install.INSTALL_SCHEMES.values():
if d.get('scripts', '').endswith('/bin'):
d['scripts'] = d['scripts'][:-len('/bin')] + '/sbin'
--- ./setup.py-orig 2019-11-26 10:14:27.000000000 +0100
+++ ./setup.py 2019-11-26 13:30:00.403150112 +0100
@@ -4,13 +4,6 @@ from distutils.core import setup
from distutils.command import install as distutils_install
from iotop.version import VERSION
-# Dirty hack to make setup.py install the iotop script to sbin/ instead of bin/
-# while still honoring the choice of installing into local/ or not.
-if hasattr(distutils_install, 'INSTALL_SCHEMES'):
- for d in distutils_install.INSTALL_SCHEMES.values():
- if d.get('scripts', '').endswith('/bin'):
- d['scripts'] = d['scripts'][:-len('/bin')] + '/sbin'
-
setup(name='iotop',
version=VERSION,
description='Per process I/O bandwidth monitor',
--- ./iotop/data.py-orig 2020-01-16 11:21:12.827874630 +0100
+++ ./iotop/data.py 2020-01-16 11:43:56.467458186 +0100
@@ -285,8 +285,8 @@ class ProcessInfo(DumpableObject):
def get_cmdline(self):
# A process may exec, so we must always reread its cmdline
try:
- proc_cmdline = open('/proc/%d/cmdline' % self.pid)
- cmdline = proc_cmdline.read(4096)
+ proc_cmdline = open('/proc/%d/cmdline' % self.pid, 'rb')
+ cmdline = proc_cmdline.read(4096).decode('utf-8', errors='replace')
except IOError:
return '{no such process}'
proc_status = parse_proc_pid_status(self.pid)
#!/bin/sh /etc/rc.common
# Copyright (C) 2014 OpenWrt.org
START=60
START=99
USE_PROCD=1
PROG=/usr/bin/monit
......
......@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=reschroot
PKG_VERSION:=1.6.13
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeberg.org/shelter/reschroot/archive/release
......@@ -27,6 +27,9 @@ define Package/schroot
TITLE:=Securely enter a chroot and run a command or login shell.
DEPENDS:=$(ICONV_DEPENDS) \
+boost +boost-filesystem +boost-iostreams +boost-program_options +boost-regex \
+!BUSYBOX_CONFIG_REALPATH:coreutils-realpath \
+!BUSYBOX_CONFIG_FEATURE_STAT_FORMAT:coreutils-stat \
+!BUSYBOX_CONFIG_TAC:coreutils-tac \
+SCHROOT_BTRFS:btrfs-progs \
+SCHROOT_LOOPBACK:losetup \
+SCHROOT_LVM:lvm2 \
......
......@@ -75,10 +75,10 @@
# Device and inode
- da=$(/usr/bin/stat --format="%d %i" "$1")
+ da=$(/bin/stat --format="%d %i" "$1")
+ da=$(stat -c "%d %i" "$1")
# This one can fail since it might not exist yet
- db=$(/usr/bin/stat --format="%d %i" "$2" 2>/dev/null || :)
+ db=$(/bin/stat --format="%d %i" "$2" 2>/dev/null || :)
+ db=$(stat -c "%d %i" "$2" 2>/dev/null || :)
if [ "$da" = "$db" ]; then
COPY="false"
......@@ -98,10 +98,10 @@
# Device and inode
- dr=$(/usr/bin/stat --format="%d %i" "/etc/$db")
+ dr=$(/bin/stat --format="%d %i" "/etc/$db")
+ dr=$(stat -c "%d %i" "/etc/$db")
# This one can fail since it might not exist yet
- dc=$(/usr/bin/stat --format="%d %i" "${CHROOT_PATH}/etc/$db" 2>/dev/null || :)
+ dc=$(/bin/stat --format="%d %i" "${CHROOT_PATH}/etc/$db" 2>/dev/null || :)
+ dc=$(stat -c "%d %i" "${CHROOT_PATH}/etc/$db" 2>/dev/null || :)
# If the database inside and outside the chroot is the
# same, it's very likely that dup_nss would blank the
......
......@@ -44,7 +44,7 @@ source kernel {
};
destination messages {
file("/var/log/messages");
file("/var/log/messages" template("${C_DATE} ${HOST} ${MSGHDR}${MESSAGE}\n") );
};
log {
......
......@@ -23,7 +23,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gcc
GCC_VERSION:=$(call qstrip,$(CONFIG_GCC_VERSION))
PKG_VERSION:=$(firstword $(subst +, ,$(GCC_VERSION)))
PKG_RELEASE:=5
GCC_MAJOR_VERSION:=$(word 1,$(subst ., ,$(PKG_VERSION)))
PKG_RELEASE:=6
GCC_DIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION)
......@@ -50,7 +51,11 @@ ifeq ($(PKG_VERSION),12.3.0)
PKG_HASH:=949a5d4f99e786421a93b532b22ffab5578de7321369975b91aec97adfda8c3b
endif
PATCH_DIR=./patches/$(GCC_VERSION)
ifeq ($(PKG_VERSION),13.2.0)
PKG_HASH:=e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
endif
PATCH_DIR:=patches-$(GCC_MAJOR_VERSION).x
include $(INCLUDE_DIR)/package.mk
......