How should I set up debian.series properly?
Hello, I am trying to package deb and rpm in the same obs package with patches. I was able to do RPM somehow but applying patches with debian.series seems to have some problems. Is it just a bug or did i do something wrong? Below lines are error logs: [ 238s] Found files matching debian.*, running debian transformer... [ 238s] release: (7.1), release (DEB) (7.1) [ 238s] ** Started: debtransform --release 7.1 //usr/src/packages/SOURCES //usr/src/packages/SOURCES/wine-osu_6.12-1.dsc //usr/src/packages/SOURCES.DEB [ 238s] Transforming into source package 1.0 (non-native) format [ 238s] converting //usr/src/packages/SOURCES/wine-staging-6.12-patched.tar.xz to wine-staging-6.12-patched.tar.gz [ 248s] Moving //usr/src/packages/SOURCES/wine-staging-6.12-patched.tar.gz to //usr/src/packages/SOURCES.DEB/wine-osu_6.12.orig.tar.gz [ 248s] files dc61399b56f26a7e98d18ab3c3abf93a 50443187 wine-osu_6.12.orig.tar.gz [ 248s] Scanning //usr/src/packages/SOURCES.DEB/wine-osu_6.12.orig.tar.gz... [ 250s] Generating //usr/src/packages/SOURCES.DEB/wine-osu_6.12-1.diff [ 250s] Scanning //usr/src/packages/SOURCES/wine-osu.debian.tar.xz... [ 250s] Processing file "//usr/src/packages/SOURCES/debian.changelog"... [ 250s] Processing series file "//usr/src/packages/SOURCES/debian.series"... [ 250s] Processing patch //usr/src/packages/SOURCES/0001-Revert-to-5.14-winepulse.drv.patch... [ 250s] Processing patch //usr/src/packages/SOURCES/0002-5.14-Latency-Fix.patch... [ 250s] Processing patch //usr/src/packages/SOURCES/0003-secur32-Fix-crash-from-invalid-context-in-Initialize.patch... [ 250s] Processing patch //usr/src/packages/SOURCES/0004-kernelbase-Cache-last-used-locale-sortguid-mapping.patch... [ 250s] Writing //usr/src/packages/SOURCES.DEB/wine-osu_6.12-1.dsc [ 250s] dpkg-source: warning: extracting unsigned source package (/usr/src/packages/SOURCES.DEB/wine-osu_6.12-1.dsc) [ 250s] dpkg-source: info: extracting wine-osu in /usr/src/packages/BUILD [ 250s] dpkg-source: info: unpacking wine-osu_6.12.orig.tar.gz [ 252s] dpkg-source: info: applying wine-osu_6.12-1.diff.gz [ 252s] dpkg-source: warning: diff '/usr/src/packages/SOURCES.DEB/wine-osu_6.12-1.diff.gz' patches file /usr/src/packages/BUILD/dlls/winepulse.drv/mmdevdrv.c more than once [ 252s] dpkg-source: info: upstream files that have been modified: [ 252s] /usr/src/packages/BUILD/dlls/kernelbase/locale.c [ 252s] /usr/src/packages/BUILD/dlls/mmdevapi/devenum.c [ 252s] /usr/src/packages/BUILD/dlls/mmdevapi/tests/render.c [ 252s] /usr/src/packages/BUILD/dlls/secur32/schannel.c [ 252s] /usr/src/packages/BUILD/dlls/winealsa.drv/mmdevdrv.c [ 252s] /usr/src/packages/BUILD/dlls/wineandroid.drv/mmdevdrv.c [ 252s] /usr/src/packages/BUILD/dlls/winecoreaudio.drv/mmdevdrv.c [ 252s] /usr/src/packages/BUILD/dlls/wineoss.drv/mmdevdrv.c [ 252s] /usr/src/packages/BUILD/dlls/winepulse.drv/Makefile.in [ 252s] /usr/src/packages/BUILD/dlls/winepulse.drv/mmdevdrv.c [ 252s] /usr/src/packages/BUILD/dlls/winepulse.drv/mult.c [ 252s] /usr/src/packages/BUILD/dlls/winepulse.drv/pulse.c [ 252s] /usr/src/packages/BUILD/dlls/winepulse.drv/unixlib.h [ 252s] /usr/src/packages/BUILD/include/audioclient.idl [ 252s] ----------------------------------------------------------------- [ 252s] ----- building wine-osu_6.12-1.dsc (user abuild) [ 252s] ----------------------------------------------------------------- [ 252s] ----------------------------------------------------------------- [ 252s] dpkg-buildpackage: info: source package wine-osu [ 252s] dpkg-buildpackage: info: source version 6.12-1 [ 252s] dpkg-buildpackage: info: source distribution UNRELEASED [ 252s] dpkg-buildpackage: info: source changed by Rosanne DiMesio <dimesio@earthlink.net> [ 252s] dpkg-source --before-build . [ 252s] dpkg-buildpackage: info: host architecture amd64 [ 253s] fakeroot debian/rules clean [ 253s] dh clean --parallel [ 253s] dh: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 253s] dh_auto_clean -O--parallel [ 253s] dh_auto_clean: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 253s] dh_clean -O--parallel [ 253s] dh_clean: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 253s] dpkg-source -b . [ 254s] dpkg-source: info: using source format '3.0 (quilt)' [ 254s] dpkg-source: info: building wine-osu using existing ./wine-osu_6.12.orig.tar.gz [ 256s] dpkg-source: warning: ignoring deletion of directory autom4te.cache [ 256s] dpkg-source: warning: ignoring deletion of file autom4te.cache/output.0, use --include-removal to override [ 256s] dpkg-source: warning: ignoring deletion of file autom4te.cache/traces.0, use --include-removal to override [ 256s] dpkg-source: warning: ignoring deletion of file autom4te.cache/requests, use --include-removal to override [ 256s] dpkg-source: warning: ignoring deletion of file dlls/winepulse.drv/unixlib.h, use --include-removal to override [ 256s] dpkg-source: warning: ignoring deletion of file dlls/winepulse.drv/pulse.c, use --include-removal to override [ 256s] dpkg-source: warning: ignoring deletion of file dlls/winepulse.drv/mult.c, use --include-removal to override [ 257s] dpkg-source: info: local changes detected, the modified files are: [ 257s] BUILD/dlls/kernelbase/locale.c [ 257s] BUILD/dlls/mmdevapi/devenum.c [ 257s] BUILD/dlls/mmdevapi/tests/render.c [ 257s] BUILD/dlls/secur32/schannel.c [ 257s] BUILD/dlls/winealsa.drv/mmdevdrv.c [ 257s] BUILD/dlls/wineandroid.drv/mmdevdrv.c [ 257s] BUILD/dlls/winecoreaudio.drv/mmdevdrv.c [ 257s] BUILD/dlls/wineoss.drv/mmdevdrv.c [ 257s] BUILD/dlls/winepulse.drv/Makefile.in [ 257s] BUILD/dlls/winepulse.drv/mmdevdrv.c [ 257s] BUILD/include/audioclient.idl [ 257s] dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/wine-osu_6.12-1.diff.hsxEmH [ 257s] dpkg-source: info: you can integrate the local changes with dpkg-source --commit [ 257s] dpkg-buildpackage: error: dpkg-source -b . subprocess returned exit status 2
In the case of debian, you have to have a debian/patches directory (and in your debian.tar.gz) so the patches all need to be copied into there, where rpm handles patches as if separate source files on the directory. So yes, you end up with two copies of each patch file if you have both a rpm and deb produced from common sources and patches. That is what I did for my exosip2 patch, which produces a patched rpm and a patched deb from common source: https://build.opensuse.org/package/show/home:dyfet/libeXosip2 On Mon, 2021-07-12 at 21:59 +0900, hwsnemo wrote:
Hello, I am trying to package deb and rpm in the same obs package with patches. I was able to do RPM somehow but applying patches with debian.series seems to have some problems. Is it just a bug or did i do something wrong?
Below lines are error logs: [ 238s] Found files matching debian.*, running debian transformer... [ 238s] release: (7.1), release (DEB) (7.1) [ 238s] ** Started: debtransform --release 7.1 //usr/src/packages/SOURCES //usr/src/packages/SOURCES/wine-osu_6.12- 1.dsc //usr/src/packages/SOURCES.DEB [ 238s] Transforming into source package 1.0 (non-native) format [ 238s] converting //usr/src/packages/SOURCES/wine-staging-6.12- patched.tar.xz to wine-staging-6.12-patched.tar.gz [ 248s] Moving //usr/src/packages/SOURCES/wine-staging-6.12- patched.tar.gz to //usr/src/packages/SOURCES.DEB/wine- osu_6.12.orig.tar.gz [ 248s] files dc61399b56f26a7e98d18ab3c3abf93a 50443187 wine- osu_6.12.orig.tar.gz [ 248s] Scanning //usr/src/packages/SOURCES.DEB/wine- osu_6.12.orig.tar.gz... [ 250s] Generating //usr/src/packages/SOURCES.DEB/wine-osu_6.12- 1.diff [ 250s] Scanning //usr/src/packages/SOURCES/wine- osu.debian.tar.xz... [ 250s] Processing file "//usr/src/packages/SOURCES/debian.changelog"... [ 250s] Processing series file "//usr/src/packages/SOURCES/debian.series"... [ 250s] Processing patch //usr/src/packages/SOURCES/0001-Revert-to- 5.14-winepulse.drv.patch... [ 250s] Processing patch //usr/src/packages/SOURCES/0002-5.14- Latency-Fix.patch... [ 250s] Processing patch //usr/src/packages/SOURCES/0003-secur32- Fix-crash-from-invalid-context-in-Initialize.patch... [ 250s] Processing patch //usr/src/packages/SOURCES/0004-kernelbase- Cache-last-used-locale-sortguid-mapping.patch... [ 250s] Writing //usr/src/packages/SOURCES.DEB/wine-osu_6.12-1.dsc [ 250s] dpkg-source: warning: extracting unsigned source package (/usr/src/packages/SOURCES.DEB/wine-osu_6.12-1.dsc) [ 250s] dpkg-source: info: extracting wine-osu in /usr/src/packages/BUILD [ 250s] dpkg-source: info: unpacking wine-osu_6.12.orig.tar.gz [ 252s] dpkg-source: info: applying wine-osu_6.12-1.diff.gz [ 252s] dpkg-source: warning: diff '/usr/src/packages/SOURCES.DEB/wine-osu_6.12-1.diff.gz' patches file /usr/src/packages/BUILD/dlls/winepulse.drv/mmdevdrv.c more than once [ 252s] dpkg-source: info: upstream files that have been modified: [ 252s] /usr/src/packages/BUILD/dlls/kernelbase/locale.c [ 252s] /usr/src/packages/BUILD/dlls/mmdevapi/devenum.c [ 252s] /usr/src/packages/BUILD/dlls/mmdevapi/tests/render.c [ 252s] /usr/src/packages/BUILD/dlls/secur32/schannel.c [ 252s] /usr/src/packages/BUILD/dlls/winealsa.drv/mmdevdrv.c [ 252s] /usr/src/packages/BUILD/dlls/wineandroid.drv/mmdevdrv.c [ 252s] /usr/src/packages/BUILD/dlls/winecoreaudio.drv/mmdevdrv.c [ 252s] /usr/src/packages/BUILD/dlls/wineoss.drv/mmdevdrv.c [ 252s] /usr/src/packages/BUILD/dlls/winepulse.drv/Makefile.in [ 252s] /usr/src/packages/BUILD/dlls/winepulse.drv/mmdevdrv.c [ 252s] /usr/src/packages/BUILD/dlls/winepulse.drv/mult.c [ 252s] /usr/src/packages/BUILD/dlls/winepulse.drv/pulse.c [ 252s] /usr/src/packages/BUILD/dlls/winepulse.drv/unixlib.h [ 252s] /usr/src/packages/BUILD/include/audioclient.idl [ 252s] ------------------------------------------------------------ ----- [ 252s] ----- building wine-osu_6.12-1.dsc (user abuild) [ 252s] ------------------------------------------------------------ ----- [ 252s] ------------------------------------------------------------ ----- [ 252s] dpkg-buildpackage: info: source package wine-osu [ 252s] dpkg-buildpackage: info: source version 6.12-1 [ 252s] dpkg-buildpackage: info: source distribution UNRELEASED [ 252s] dpkg-buildpackage: info: source changed by Rosanne DiMesio < dimesio@earthlink.net> [ 252s] dpkg-source --before-build . [ 252s] dpkg-buildpackage: info: host architecture amd64 [ 253s] fakeroot debian/rules clean [ 253s] dh clean --parallel [ 253s] dh: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 253s] dh_auto_clean -O--parallel [ 253s] dh_auto_clean: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 253s] dh_clean -O--parallel [ 253s] dh_clean: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 253s] dpkg-source -b . [ 254s] dpkg-source: info: using source format '3.0 (quilt)' [ 254s] dpkg-source: info: building wine-osu using existing ./wine- osu_6.12.orig.tar.gz [ 256s] dpkg-source: warning: ignoring deletion of directory autom4te.cache [ 256s] dpkg-source: warning: ignoring deletion of file autom4te.cache/output.0, use --include-removal to override [ 256s] dpkg-source: warning: ignoring deletion of file autom4te.cache/traces.0, use --include-removal to override [ 256s] dpkg-source: warning: ignoring deletion of file autom4te.cache/requests, use --include-removal to override [ 256s] dpkg-source: warning: ignoring deletion of file dlls/winepulse.drv/unixlib.h, use --include-removal to override [ 256s] dpkg-source: warning: ignoring deletion of file dlls/winepulse.drv/pulse.c, use --include-removal to override [ 256s] dpkg-source: warning: ignoring deletion of file dlls/winepulse.drv/mult.c, use --include-removal to override [ 257s] dpkg-source: info: local changes detected, the modified files are: [ 257s] BUILD/dlls/kernelbase/locale.c [ 257s] BUILD/dlls/mmdevapi/devenum.c [ 257s] BUILD/dlls/mmdevapi/tests/render.c [ 257s] BUILD/dlls/secur32/schannel.c [ 257s] BUILD/dlls/winealsa.drv/mmdevdrv.c [ 257s] BUILD/dlls/wineandroid.drv/mmdevdrv.c [ 257s] BUILD/dlls/winecoreaudio.drv/mmdevdrv.c [ 257s] BUILD/dlls/wineoss.drv/mmdevdrv.c [ 257s] BUILD/dlls/winepulse.drv/Makefile.in [ 257s] BUILD/dlls/winepulse.drv/mmdevdrv.c [ 257s] BUILD/include/audioclient.idl [ 257s] dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/wine-osu_6.12-1.diff.hsxEmH [ 257s] dpkg-source: info: you can integrate the local changes with dpkg-source --commit [ 257s] dpkg-buildpackage: error: dpkg-source -b . subprocess returned exit status 2
You could also hack a bit by extracting the debian archive and patch with the files in there using `patch -p1 < ...`. But I assume that won't be allowed for submitting to Factory ;) Example: https://build.opensuse.org/package/view_file/home:sebix:intelmq/intelmq/inte... Sebastian On 7/12/21 3:14 PM, David Sugar wrote:
In the case of debian, you have to have a debian/patches directory (and in your debian.tar.gz) so the patches all need to be copied into there, where rpm handles patches as if separate source files on the directory. So yes, you end up with two copies of each patch file if you have both a rpm and deb produced from common sources and patches. That is what I did for my exosip2 patch, which produces a patched rpm and a patched deb from common source:
https://build.opensuse.org/package/show/home:dyfet/libeXosip2
On Mon, 2021-07-12 at 21:59 +0900, hwsnemo wrote:
Hello, I am trying to package deb and rpm in the same obs package with patches. I was able to do RPM somehow but applying patches with debian.series seems to have some problems. Is it just a bug or did i do something wrong?
Below lines are error logs: [ 238s] Found files matching debian.*, running debian transformer... [ 238s] release: (7.1), release (DEB) (7.1) [ 238s] ** Started: debtransform --release 7.1 //usr/src/packages/SOURCES //usr/src/packages/SOURCES/wine-osu_6.12- 1.dsc //usr/src/packages/SOURCES.DEB [ 238s] Transforming into source package 1.0 (non-native) format [ 238s] converting //usr/src/packages/SOURCES/wine-staging-6.12- patched.tar.xz to wine-staging-6.12-patched.tar.gz [ 248s] Moving //usr/src/packages/SOURCES/wine-staging-6.12- patched.tar.gz to //usr/src/packages/SOURCES.DEB/wine- osu_6.12.orig.tar.gz [ 248s] files dc61399b56f26a7e98d18ab3c3abf93a 50443187 wine- osu_6.12.orig.tar.gz [ 248s] Scanning //usr/src/packages/SOURCES.DEB/wine- osu_6.12.orig.tar.gz... [ 250s] Generating //usr/src/packages/SOURCES.DEB/wine-osu_6.12- 1.diff [ 250s] Scanning //usr/src/packages/SOURCES/wine- osu.debian.tar.xz... [ 250s] Processing file "//usr/src/packages/SOURCES/debian.changelog"... [ 250s] Processing series file "//usr/src/packages/SOURCES/debian.series"... [ 250s] Processing patch //usr/src/packages/SOURCES/0001-Revert-to- 5.14-winepulse.drv.patch... [ 250s] Processing patch //usr/src/packages/SOURCES/0002-5.14- Latency-Fix.patch... [ 250s] Processing patch //usr/src/packages/SOURCES/0003-secur32- Fix-crash-from-invalid-context-in-Initialize.patch... [ 250s] Processing patch //usr/src/packages/SOURCES/0004-kernelbase- Cache-last-used-locale-sortguid-mapping.patch... [ 250s] Writing //usr/src/packages/SOURCES.DEB/wine-osu_6.12-1.dsc [ 250s] dpkg-source: warning: extracting unsigned source package (/usr/src/packages/SOURCES.DEB/wine-osu_6.12-1.dsc) [ 250s] dpkg-source: info: extracting wine-osu in /usr/src/packages/BUILD [ 250s] dpkg-source: info: unpacking wine-osu_6.12.orig.tar.gz [ 252s] dpkg-source: info: applying wine-osu_6.12-1.diff.gz [ 252s] dpkg-source: warning: diff '/usr/src/packages/SOURCES.DEB/wine-osu_6.12-1.diff.gz' patches file /usr/src/packages/BUILD/dlls/winepulse.drv/mmdevdrv.c more than once [ 252s] dpkg-source: info: upstream files that have been modified: [ 252s] /usr/src/packages/BUILD/dlls/kernelbase/locale.c [ 252s] /usr/src/packages/BUILD/dlls/mmdevapi/devenum.c [ 252s] /usr/src/packages/BUILD/dlls/mmdevapi/tests/render.c [ 252s] /usr/src/packages/BUILD/dlls/secur32/schannel.c [ 252s] /usr/src/packages/BUILD/dlls/winealsa.drv/mmdevdrv.c [ 252s] /usr/src/packages/BUILD/dlls/wineandroid.drv/mmdevdrv.c [ 252s] /usr/src/packages/BUILD/dlls/winecoreaudio.drv/mmdevdrv.c [ 252s] /usr/src/packages/BUILD/dlls/wineoss.drv/mmdevdrv.c [ 252s] /usr/src/packages/BUILD/dlls/winepulse.drv/Makefile.in [ 252s] /usr/src/packages/BUILD/dlls/winepulse.drv/mmdevdrv.c [ 252s] /usr/src/packages/BUILD/dlls/winepulse.drv/mult.c [ 252s] /usr/src/packages/BUILD/dlls/winepulse.drv/pulse.c [ 252s] /usr/src/packages/BUILD/dlls/winepulse.drv/unixlib.h [ 252s] /usr/src/packages/BUILD/include/audioclient.idl [ 252s] ------------------------------------------------------------ ----- [ 252s] ----- building wine-osu_6.12-1.dsc (user abuild) [ 252s] ------------------------------------------------------------ ----- [ 252s] ------------------------------------------------------------ ----- [ 252s] dpkg-buildpackage: info: source package wine-osu [ 252s] dpkg-buildpackage: info: source version 6.12-1 [ 252s] dpkg-buildpackage: info: source distribution UNRELEASED [ 252s] dpkg-buildpackage: info: source changed by Rosanne DiMesio < dimesio@earthlink.net> [ 252s] dpkg-source --before-build . [ 252s] dpkg-buildpackage: info: host architecture amd64 [ 253s] fakeroot debian/rules clean [ 253s] dh clean --parallel [ 253s] dh: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 253s] dh_auto_clean -O--parallel [ 253s] dh_auto_clean: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 253s] dh_clean -O--parallel [ 253s] dh_clean: warning: Compatibility levels before 10 are deprecated (level 9 in use) [ 253s] dpkg-source -b . [ 254s] dpkg-source: info: using source format '3.0 (quilt)' [ 254s] dpkg-source: info: building wine-osu using existing ./wine- osu_6.12.orig.tar.gz [ 256s] dpkg-source: warning: ignoring deletion of directory autom4te.cache [ 256s] dpkg-source: warning: ignoring deletion of file autom4te.cache/output.0, use --include-removal to override [ 256s] dpkg-source: warning: ignoring deletion of file autom4te.cache/traces.0, use --include-removal to override [ 256s] dpkg-source: warning: ignoring deletion of file autom4te.cache/requests, use --include-removal to override [ 256s] dpkg-source: warning: ignoring deletion of file dlls/winepulse.drv/unixlib.h, use --include-removal to override [ 256s] dpkg-source: warning: ignoring deletion of file dlls/winepulse.drv/pulse.c, use --include-removal to override [ 256s] dpkg-source: warning: ignoring deletion of file dlls/winepulse.drv/mult.c, use --include-removal to override [ 257s] dpkg-source: info: local changes detected, the modified files are: [ 257s] BUILD/dlls/kernelbase/locale.c [ 257s] BUILD/dlls/mmdevapi/devenum.c [ 257s] BUILD/dlls/mmdevapi/tests/render.c [ 257s] BUILD/dlls/secur32/schannel.c [ 257s] BUILD/dlls/winealsa.drv/mmdevdrv.c [ 257s] BUILD/dlls/wineandroid.drv/mmdevdrv.c [ 257s] BUILD/dlls/winecoreaudio.drv/mmdevdrv.c [ 257s] BUILD/dlls/wineoss.drv/mmdevdrv.c [ 257s] BUILD/dlls/winepulse.drv/Makefile.in [ 257s] BUILD/dlls/winepulse.drv/mmdevdrv.c [ 257s] BUILD/include/audioclient.idl [ 257s] dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/wine-osu_6.12-1.diff.hsxEmH [ 257s] dpkg-source: info: you can integrate the local changes with dpkg-source --commit [ 257s] dpkg-buildpackage: error: dpkg-source -b . subprocess returned exit status 2
participants (3)
-
David Sugar -
hwsnemo -
Sebix